[gnome-documents] Don't use EggListBox

[Giovanni Campagna <gcampagna src gnome org>]

commit 0af141ca18e727cbc8a6baedbb748dead40c76d7
Author: Giovanni Campagna <gcampagna src gnome org>
Date:   Fri Jun 14 23:59:30 2013 +0200

    Don't use EggListBox
    
    We can use GtkListBox, and remove the can of worms that EggListBox
    is.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=702295

 .gitmodules         |    3 -
 Makefile.am         |    2 +-
 autogen.sh          |    4 --
 configure.ac        |   14 +------
 egg-list-box        |    1 -
 m4/ax_config_dir.m4 |  109 ---------------------------------------------------
 po/POTFILES.skip    |    1 -
 src/Makefile.am     |    2 +-
 src/presentation.js |    9 ++--
 9 files changed, 8 insertions(+), 137 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
index ee3430a..bfd964e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "libgd"]
        path = libgd
        url = git://git.gnome.org/libgd
-[submodule "egg-list-box"]
-       path = egg-list-box
-       url = git://git.gnome.org/egg-list-box
diff --git a/Makefile.am b/Makefile.am
index d77c23f..824785d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS}
 
-SUBDIRS = libgd egg-list-box src data man po
+SUBDIRS = libgd src data man po
 
 if ENABLE_GETTING_STARTED
 
diff --git a/autogen.sh b/autogen.sh
index 8eeeed4..b87ffaa 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -20,10 +20,6 @@ which gnome-autogen.sh || {
 
 git submodule update --init --recursive
 
-cd egg-list-box
-sh autogen.sh --no-configure
-cd ..
-
 REQUIRED_AUTOCONF_VERSION=2.59
 REQUIRED_AUTOMAKE_VERSION=1.9
 REQUIRED_INTLTOOL_VERSION=0.40.0
diff --git a/configure.ac b/configure.ac
index da241d5..e716d76 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,19 +50,10 @@ GETTING_STARTED_INIT
 AC_CHECK_LIBM
 AC_SUBST(LIBM)
 
-# EggListBox submodule
-prev_top_build_prefix=$ac_top_build_prefix
-prev_ac_configure_args=$ac_configure_args
-AX_CONFIG_DIR([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"egg-list-box
-
 EVINCE_MIN_VERSION=3.7.4
 WEBKITGTK_MIN_VERSION=1.10.0
 GLIB_MIN_VERSION=2.37.0
-GTK_MIN_VERSION=3.9.1
+GTK_MIN_VERSION=3.9.3
 GOBJECT_INTROSPECTION_MIN_VERSION=1.31.6
 GDATA_MIN_VERSION=0.13.3
 GOA_MIN_VERSION=3.2.0
@@ -86,8 +77,7 @@ PKG_CHECK_MODULES(DOCUMENTS,
                   tracker-sparql-0.16 >= $TRACKER_MIN_VERSION
                   goa-1.0 >= $GOA_MIN_VERSION
                   libgdata >= $GDATA_MIN_VERSION
-                  zapojit-0.0 >= $ZAPOJIT_MIN_VERSION
-                  egg-list-box)
+                  zapojit-0.0 >= $ZAPOJIT_MIN_VERSION)
 
 PKG_CHECK_MODULES(MINER,
                   tracker-sparql-0.16 >= $TRACKER_MIN_VERSION
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index d101e56..8413360 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,2 +1 @@
 data/gnome-documents.desktop.in
-egg-list-box/egg-flow-box.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 07f82bd..f8d7966 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -51,7 +51,7 @@ resource_DATA = gnome-documents.gresource
 
 CLEANFILES += gnome-documents.gresource
 
-gir_DATA += ../egg-list-box/Egg-1.0.gir $(INTROSPECTION_GIRS)
+gir_DATA += $(INTROSPECTION_GIRS)
 typelib_DATA += $(gir_DATA:.gir=.typelib)
 
 CLEANFILES += $(gir_DATA) $(typelib_DATA)
diff --git a/src/presentation.js b/src/presentation.js
index b048c79..379c43d 100644
--- a/src/presentation.js
+++ b/src/presentation.js
@@ -17,7 +17,6 @@
  *
  */
 
-const Egg = imports.gi.Egg;
 const EvDocument = imports.gi.EvinceDocument;
 const EvView = imports.gi.EvinceView;
 const GnomeDesktop = imports.gi.GnomeDesktop;
@@ -139,8 +138,8 @@ const PresentationOutputChooser = new Lang.Class({
         }
     },
 
-    _onActivated: function(box, child) {
-        this.output = child.output;
+    _onActivated: function(box, row) {
+        this.output = row.get_child().output;
         this.emit('output-activated', this.output);
         this.close();
     },
@@ -164,8 +163,8 @@ const PresentationOutputChooser = new Lang.Class({
                 this.emit('output-activated', null);
             }));
 
-        this._box = new Egg.ListBox({ valign: Gtk.Align.CENTER });
-        this._box.connect('child-activated', Lang.bind(this, this._onActivated));
+        this._box = new Gtk.ListBox({ valign: Gtk.Align.CENTER });
+        this._box.connect('row-activated', Lang.bind(this, this._onActivated));
         let contentArea = this.window.get_content_area();
         contentArea.pack_start(this._box, true, false, 0);
     }