gtk+ r19396 - in branches/gtk-2-12: . gtk

[herzi svn gnome org]

Author: herzi
Date: Fri Jan 25 01:08:40 2008
New Revision: 19396
URL: http://svn.gnome.org/viewvc/gtk+?rev=19396&view=rev

Log:
2008-01-25  Sven Herzberg  <sven imendio com>

	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



Modified:
   branches/gtk-2-12/ChangeLog
   branches/gtk-2-12/gtk/gtkuimanager.c

Modified: branches/gtk-2-12/gtk/gtkuimanager.c
==============================================================================
--- branches/gtk-2-12/gtk/gtkuimanager.c	(original)
+++ branches/gtk-2-12/gtk/gtkuimanager.c	Fri Jan 25 01:08:40 2008
@@ -1850,6 +1850,8 @@
 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));