Reviewed by Johan Dahlin.

2008-01-25  Sven Herzberg  <sven@imendio.com>

	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=/trunk/; revision=19395

diff --git a/ChangeLog b/ChangeLog
index a6769972d29c3b764f9f2d1f17013aabbc2561a1..848d8552b7d386ccf8d6f19fc43e37272dea4cbc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-25  Sven Herzberg  <sven@imendio.com>
+
+       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-24  Johan Dahlin  <johan@gnome.org>
 
        * gtk/gtkdialog.c (gtk_dialog_buildable_get_internal_child): 

diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c
index 8f9b073a8f435c97f93125f93747067f1a2b06c9..fa95be115155528b5ac7e662f321eec607b72385 100644 (file)
--- 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));