remove egg-list-box

https://bugzilla.gnome.org/show_bug.cgi?id=706988

diff --git a/.gitmodules b/.gitmodules
index ad310feb89fc03d783c82538bbe4ecbd68d2abdc..6c30dad66b081a40f7dbf353a88810a5761f73ae 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "libempathy-gtk/egg-list-box"]
-       path = libempathy-gtk/egg-list-box
-       url = git://git.gnome.org/egg-list-box
 [submodule "telepathy-account-widgets"]
        path = telepathy-account-widgets
        url = git://git.gnome.org/telepathy-account-widgets.git

diff --git a/autogen.sh b/autogen.sh
index 0fcb6fd782f5d517018b867b5864e173d7c7693f..ef19a9fb16585b980980173bf92006ea358f75e0 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -19,17 +19,13 @@ which gnome-autogen.sh || {
 }
 
 # Fetch submodules if needed
-if test ! -f libempathy-gtk/egg-list-box/COPYING -o ! -f telepathy-account-widgets/COPYING;
+if test ! -f telepathy-account-widgets/COPYING;
 then
   echo "+ Setting up submodules"
   git submodule init
 fi
 git submodule update
 
-cd libempathy-gtk/egg-list-box
-sh autogen.sh --no-configure
-cd ../..
-
 cd telepathy-account-widgets
 sh autogen.sh --no-configure
 cd ..

diff --git a/configure.ac b/configure.ac
index 5f05c3b63f63348a13213c370a836b7036d907f5..77be8f463c150826a87a0545ecb136c557deceaf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -107,16 +107,6 @@ EMPATHY_UOA_PROVIDER=`pkg-config --variable=uoa_provider telepathy-account-widge
 AC_DEFINE_UNQUOTED(EMPATHY_UOA_PROVIDER, "$EMPATHY_UOA_PROVIDER",
    [Name of provider for accounts imported from libaccounts])
 
-# egg-list-box
-prev_top_build_prefix=$ac_top_build_prefix
-prev_ac_configure_args=$ac_configure_args
-AX_CONFIG_DIR([libempathy-gtk/egg-list-box])
-ac_top_build_prefix=$prev_top_build_prefix
-ac_configure_args=$prev_ac_configure_args
-
-export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:"$ac_top_build_prefix"libempathy-gtk/egg-list-box
-PKG_CHECK_MODULES(EGGLISTBOX, egg-list-box)
-
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([configure.ac])

diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index baa5a556cdcf208cb768721b3d2c52b78be02539..44789fdea83d3d908e41afb9418fd14056bdf43c 100644 (file)
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -1,5 +1,3 @@
-SUBDIRS = egg-list-box
-
 include $(top_srcdir)/tools/flymake.mk
 
 AM_CPPFLAGS =                                           \
@@ -179,7 +177,6 @@ libempathy_gtk_la_LIBADD =                  \
        $(GCR_LIBS)                             \
        $(MEEGO_LIBS)                           \
        $(CHEESE_LIBS)                          \
-       $(top_builddir)/libempathy-gtk/egg-list-box/libegglistbox.la \
        $(top_builddir)/libempathy/libempathy.la
 
 check_c_sources = \

diff --git a/libempathy-gtk/egg-list-box b/libempathy-gtk/egg-list-box
deleted file mode 160000 (submodule)
index b0131f8..0000000
--- a/libempathy-gtk/egg-list-box
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b0131f8ad049e5debe44e3326cc1a8cab1739e3a

diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index c635d07ecfd2812f2d5ae6f38a6970330f98a6ae..7488a615841c9798c537ea24c5d4e20cd794beb7 100644 (file)
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -2,6 +2,4 @@
 
 data/empathy.desktop.in
 
-libempathy-gtk/egg-list-box/egg-flow-box.c
-
 telepathy-account-widgets