From cc7b318d33b2c81c2884de9a7a84cadbfcc05c98 Mon Sep 17 00:00:00 2001 From: Sven Herzberg Date: Fri, 25 Jan 2008 01:08:40 +0000 Subject: [PATCH] Merge from trunk: 2008-01-25 Sven Herzberg Merge from trunk: Reviewed by Johan Dahlin. * gtk/gtkuimanager.c (gtk_ui_manager_remove_ui): emit a warning if this is called with something that's not a GtkUIManager svn path=/branches/gtk-2-12/; revision=19396 --- ChangeLog | 9 +++++++++ gtk/gtkuimanager.c | 2 ++ 2 files changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index 28c495deaf..f545d5eeb7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-01-25 Sven Herzberg + + Merge from trunk: + + Reviewed by Johan Dahlin. + + * gtk/gtkuimanager.c (gtk_ui_manager_remove_ui): emit a warning if + this is called with something that's not a GtkUIManager + 2008-01-18 Johan Dahlin Merge from trunk: diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c index 664640dd23..c0570bb2f7 100644 --- a/gtk/gtkuimanager.c +++ b/gtk/gtkuimanager.c @@ -1850,6 +1850,8 @@ void gtk_ui_manager_remove_ui (GtkUIManager *self, guint merge_id) { + g_return_if_fail (GTK_IS_UI_MANAGER (self)); + g_node_traverse (self->private_data->root_node, G_POST_ORDER, G_TRAVERSE_ALL, -1, remove_ui, GUINT_TO_POINTER (merge_id));