[Xfce4-commits] <libxfce4ui:stephan/gtk3> Fix compile issues

[Stephan Arts]

Updating branch refs/heads/stephan/gtk3
         to d289d0b562e84ef143447a53b641c29de5a34585 (commit)
       from 9fb9dbe83ba093d0b3300e9d9a9969fe2009be53 (commit)

commit d289d0b562e84ef143447a53b641c29de5a34585
Author: Stephan Arts <stephan at xfce.org>
Date:   Fri Oct 7 20:14:51 2011 +0200

    Fix compile issues

 configure.ac.in          |    8 ++++----
 glade/libxfce4ui-glade.c |   10 +++++-----
 xfce4-about/Makefile.am  |    2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index e8b69e0..88da032 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -152,7 +152,7 @@ AM_CONDITIONAL([ENABLE_KEYBOARD_LIBRARY], [test "x$enable_keyboard_library" = "x
 dnl *********************************************************
 dnl *** Optional support for the Glade Interface Designer ***
 dnl *********************************************************
-XDT_CHECK_OPTIONAL_PACKAGE([GLADEUI], [gladeui-1.0],
+XDT_CHECK_OPTIONAL_PACKAGE([GLADEUI], [gladeui-2.0],
                            [3.5.0], [gladeui], [glade interface designer])
 AC_ARG_WITH([gladeui-catalogdir],
             [AC_HELP_STRING([--with-gladeui-catalogdir=PATH],
@@ -168,17 +168,17 @@ AC_ARG_WITH([gladeui-pixmapdir],
             [gladeui_pixmapdir="$withval"])
 if test x"$GLADEUI_FOUND" = x"yes"; then
   if test x"$gladeui_catalogdir" = x""; then
-    GLADEUI_CATALOGDIR=`$PKG_CONFIG "--variable=catalogdir" "gladeui-1.0"`
+    GLADEUI_CATALOGDIR=`$PKG_CONFIG "--variable=catalogdir" "gladeui-2.0"`
   else
     GLADEUI_CATALOGDIR="$gladeui_catalogdir"
   fi
   if test x"$gladeui_moduledir" = x""; then
-    GLADEUI_MODULEDIR=`$PKG_CONFIG "--variable=moduledir" "gladeui-1.0"`
+    GLADEUI_MODULEDIR=`$PKG_CONFIG "--variable=moduledir" "gladeui-2.0"`
   else
     GLADEUI_MODULEDIR="$gladeui_moduledir"
   fi
   if test x"$gladeui_pixmapdir" = x""; then
-    GLADEUI_PIXMAPDIR=`$PKG_CONFIG "--variable=pixmapdir" "gladeui-1.0"`
+    GLADEUI_PIXMAPDIR=`$PKG_CONFIG "--variable=pixmapdir" "gladeui-2.0"`
   else
     GLADEUI_PIXMAPDIR="$gladeui_pixmapdir"
   fi
diff --git a/glade/libxfce4ui-glade.c b/glade/libxfce4ui-glade.c
index 28760d5..fce721b 100644
--- a/glade/libxfce4ui-glade.c
+++ b/glade/libxfce4ui-glade.c
@@ -59,11 +59,11 @@ glade_xfce_titled_dialog_post_create (GladeWidgetAdaptor *adaptor,
   if (XFCE_IS_TITLED_DIALOG (dialog))
     {
       /* create the dialog vbxo */
-      vbox = glade_widget_adaptor_create_internal (widget, G_OBJECT (dialog->vbox), "vbox", "dialog", FALSE, reason);
+      vbox = glade_widget_adaptor_create_internal (widget, G_OBJECT(gtk_dialog_get_content_area (dialog)), "vbox", "dialog", FALSE, reason);
       glade_widget_remove_property (vbox, "border-width");
 
       /* create the action area */
-      action_area = glade_widget_adaptor_create_internal (vbox, G_OBJECT (dialog->action_area), "action_area", "dialog", FALSE, reason);
+      action_area = glade_widget_adaptor_create_internal (vbox, G_OBJECT (gtk_dialog_get_action_area (dialog)), "action_area", "dialog", FALSE, reason);
       glade_widget_remove_property (action_area, "border-width");
       glade_widget_remove_property (action_area, "spacing");
 
@@ -91,9 +91,9 @@ glade_xfce_titled_dialog_get_internal_child (GladeWidgetAdaptor *adaptor,
   g_return_val_if_fail (XFCE_IS_TITLED_DIALOG (dialog), NULL);
 
   if (strcmp ("vbox", name) == 0)
-    child = dialog->vbox;
+    child = gtk_dialog_get_content_area(dialog);
   else if (strcmp ("action_area", name) == 0)
-    child = dialog->action_area;
+    child = gtk_dialog_get_action_area(dialog);
 
   return child;
 }
@@ -106,5 +106,5 @@ glade_xfce_titled_dialog_get_children (GladeWidgetAdaptor *adaptor,
 {
   g_return_val_if_fail (XFCE_IS_TITLED_DIALOG (dialog), NULL);
 
-  return g_list_prepend (NULL, dialog->vbox);
+  return g_list_prepend (NULL, gtk_dialog_get_content_area(dialog));
 }
diff --git a/xfce4-about/Makefile.am b/xfce4-about/Makefile.am
index 8838cf8..bf35601 100644
--- a/xfce4-about/Makefile.am
+++ b/xfce4-about/Makefile.am
@@ -39,7 +39,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 if MAINTAINER_MODE
 
 about-dialog-ui.h: $(srcdir)/xfce4-about-dialog.glade Makefile
-	$(AM_V_GEN) xdt-csource --static --strip-comments --strip-content --name=xfce_about_dialog_ui $< >$@
+	$(AM_V_GEN) exo-csource --static --strip-comments --strip-content --name=xfce_about_dialog_ui $< >$@
 
 DISTCLEANFILES = \
 	$(xfce4_about_built_sources)