Updating branch refs/heads/master
to 3c7d0ffff548944773996d7d8dd8a27bd328ebc6 (commit)
from 516e64d34d97f972b5f2961003e0e9b920cd8e55 (commit)
commit 3c7d0ffff548944773996d7d8dd8a27bd328ebc6
Author: Nick Schermer <[email protected]>
Date: Mon Nov 14 23:29:45 2011 +0100
Fix build against 3.9 Glade (bug #7334).
glade/libxfce4ui-glade.c | 14 +++++++++-----
xfce4-about/Makefile.am | 10 ++++------
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/glade/libxfce4ui-glade.c b/glade/libxfce4ui-glade.c
index 28760d5..7b8c282 100644
--- a/glade/libxfce4ui-glade.c
+++ b/glade/libxfce4ui-glade.c
@@ -59,11 +59,15 @@ 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 +95,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 +110,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..0187239 100644
--- a/xfce4-about/Makefile.am
+++ b/xfce4-about/Makefile.am
@@ -41,18 +41,16 @@ 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 $< >$@
-DISTCLEANFILES = \
- $(xfce4_about_built_sources)
-
BUILT_SOURCES = \
$(xfce4_about_built_sources)
endif
-EXTRA_DIST = \
- $(desktop_in_files) \
+EXTRA_DIST = \
+ $(desktop_in_files) \
xfce4-about-dialog.glade
-DISTCLEANFILES = \
+DISTCLEANFILES = \
+ $(xfce4_about_built_sources) \
$(desktop_DATA)
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
