gimp r24594 - in trunk: . app/widgets

[neo svn gnome org]

Author: neo
Date: Thu Jan 10 22:17:28 2008
New Revision: 24594
URL: http://svn.gnome.org/viewvc/gimp?rev=24594&view=rev

Log:
2008-01-10  Sven Neumann  <sven gimp org>

	* app/widgets/gimpuimanager.c (gimp_ui_manager_ui_popup):
	gracefully deal with a NULL return value from
	gtk_ui_manager_get_widget(). This happens when the XML menu
	definitions are not found.



Modified:
   trunk/ChangeLog
   trunk/app/widgets/gimpuimanager.c

Modified: trunk/app/widgets/gimpuimanager.c
==============================================================================
--- trunk/app/widgets/gimpuimanager.c	(original)
+++ trunk/app/widgets/gimpuimanager.c	Thu Jan 10 22:17:28 2008
@@ -588,6 +588,9 @@
   if (GTK_IS_MENU_ITEM (widget))
     widget = gtk_menu_item_get_submenu (GTK_MENU_ITEM (widget));
 
+  if (! widget)
+    return;
+
   g_return_if_fail (GTK_IS_MENU (widget));
 
   if (! position_func)