summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Klapper <a9016009@gmx.de>2010-03-11 12:56:12 +0100
committerAndre Klapper <a9016009@gmx.de>2010-03-11 12:56:12 +0100
commit23ea5c5fc41ed8c43231c23e59eb3f1872e5a836 (patch)
tree97263cb3350099224bbb1009ce0e98132af27e1d
parent33f5723c51fca4352b299350a4f1c2e48c671a2f (diff)
downloadgconf-23ea5c5fc41ed8c43231c23e59eb3f1872e5a836.tar.gz
Make gconf compile with -DGSEAL_ENABLE
-rw-r--r--configure.in4
-rw-r--r--examples/basic-gconf-app.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.in b/configure.in
index a0ad70bc..cdbcd151 100644
--- a/configure.in
+++ b/configure.in
@@ -142,7 +142,7 @@ AC_ARG_ENABLE(gtk,
PKGCONFIG_MODULES='glib-2.0 > 2.14.0 gmodule-2.0 >= 2.7.0 gobject-2.0 >= 2.7.0 ORBit-2.0 >= 2.4.0 dbus-1 >= 1.0.0 dbus-glib-1 >= 0.74'
PKGCONFIG_MODULES_WITH_XML="$PKGCONFIG_MODULES libxml-2.0"
-PKGCONFIG_MODULES_WITH_GTK=" $PKGCONFIG_MODULES gtk+-2.0 >= 2.0.0"
+PKGCONFIG_MODULES_WITH_GTK=" $PKGCONFIG_MODULES gtk+-2.0 >= 2.14.0"
PKGCONFIG_MODULES_WITH_XML_AND_GTK=" $PKGCONFIG_MODULES gtk+-2.0 libxml-2.0"
PKG_CHECK_MODULES(DEPENDENT, $PKGCONFIG_MODULES)
@@ -154,7 +154,7 @@ if test "x$enable_gtk" != "xno"; then
if test "x$enable_gtk" = "xyes" && test "x$HAVE_GTK" = "xno"; then
AC_MSG_ERROR([[
-*** Could not find GTK+ 2.0 or greater.
+*** Could not find GTK+ 2.14 or greater.
*** Go to http://www.gtk.org/ to get it.]])
fi
else
diff --git a/examples/basic-gconf-app.c b/examples/basic-gconf-app.c
index bb88a53c..35de3437 100644
--- a/examples/basic-gconf-app.c
+++ b/examples/basic-gconf-app.c
@@ -457,7 +457,7 @@ create_prefs_dialog (GtkWidget *parent,
gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area(dialog)),
vbox, TRUE, TRUE, 0);
entry = create_config_entry (dialog, client, "/apps/basic-gconf-app/foo",