Commit 0af141ca authored by Giovanni Campagna's avatar Giovanni Campagna
Browse files

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
parent 223fc4e5
[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
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
......
......@@ -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
......
......@@ -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
......
egg-list-box @ 78851fd1
Subproject commit 78851fd19a0d1ce23197e51c2611ed09b777fe10
dnl Copied from Audacity 1.3.10 which itself is licensed under the GPL v2 or
dnl any later version
dnl Function to configure a sub-library now, because we need to know the result
dnl of the configuration now in order to take decisions.
dnl We don't worry about whether the configuration worked or not - it is
dnl assumed that the next thing after this will be a package-specific check to
dnl see if the package is actually available. (Hint: use pkg-config and
dnl -uninstalled.pc files if available).
dnl code based on a simplification of _AC_OUTPUT_SUBDIRS in
dnl /usr/share/autoconf/autoconf/status.m4 which implements part of
dnl AC_CONFIG_SUBDIRS
AC_DEFUN([AX_CONFIG_DIR],
[AC_REQUIRE([AC_DISABLE_OPTION_CHECKING])]
[m4_append([_AC_LIST_SUBDIRS], [$1], [])]
[
# Remove --cache-file and --srcdir arguments so they do not pile up.
ax_sub_configure_args=
ax_prev=
eval "set x $ac_configure_args"
shift
for ax_arg
do
if test -n "$ax_prev"; then
ax_prev=
continue
fi
case $ax_arg in
-cache-file | --cache-file | --cache-fil | --cache-fi \
| --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
ax_prev=cache_file ;;
-cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
| --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \
| --c=*)
;;
--config-cache | -C)
;;
-srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
ax_prev=srcdir ;;
-srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
;;
-prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
ax_prev=prefix ;;
-prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
;;
*)
case $ax_arg in
*\'*) ax_arg=`echo "$ax_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
ax_sub_configure_args="$ax_sub_configure_args '$ax_arg'" ;;
esac
done
# Always prepend --prefix to ensure using the same prefix
# in subdir configurations.
ax_arg="--prefix=$prefix"
case $ax_arg in
*\'*) ax_arg=`echo "$ax_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
ax_sub_configure_args="'$ax_arg' $ax_sub_configure_args"
# Pass --silent
if test "$silent" = yes; then
ax_sub_configure_args="--silent $ax_sub_configure_args"
fi
ax_popdir=`pwd`
AC_MSG_NOTICE([Configuring sources in $1])
dnl for out-of-place builds srcdir and builddir will be different, and
dnl builddir may not exist, so we must create it
AS_MKDIR_P(["$1"])
dnl and also set the variables. As this isn't autoconf, the following may be
dnl risky:
_AC_SRCDIRS(["$1"])
cd "$1"
# Check for guested configure; otherwise get Cygnus style configure.
if test -f "configure.gnu"; then
ax_sub_configure=$ac_srcdir/configure.gnu
elif test -f "$ac_srcdir/configure"; then
ax_sub_configure=$ac_srcdir/configure
elif test -f "$ac_srcdir/configure.in"; then
# This should be Cygnus configure.
ax_sub_configure=$ac_aux_dir/configure
else
AC_MSG_WARN([no configuration information is in $1])
ax_sub_configure=
fi
# The recursion is here.
if test -n "$ax_sub_configure"; then
# Make the cache file name correct relative to the subdirectory.
case $cache_file in
[[\\/]]* | ?:[[\\/]]* ) ax_sub_cache_file=$cache_file ;;
*) # Relative name.
ax_sub_cache_file=$ac_top_build_prefix$cache_file ;;
esac
AC_MSG_NOTICE([running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ax_sub_cache_file --srcdir=$ac_srcdir])
# The eval makes quoting arguments work.
eval "\$SHELL \"\$ax_sub_configure\" $ax_sub_configure_args \
--cache-file=\"\$ax_sub_cache_file\" --srcdir=\"\$ax_srcdir\""
fi
cd "$ax_popdir"
AC_MSG_NOTICE([Done configuring in $1])
])
data/gnome-documents.desktop.in
egg-list-box/egg-flow-box.c
......@@ -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)
......
......@@ -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);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment