gtk+ r20811 - in trunk: . gtk

[cneumair svn gnome org]

Author: cneumair
Date: Mon Jul  7 23:17:40 2008
New Revision: 20811
URL: http://svn.gnome.org/viewvc/gtk+?rev=20811&view=rev

Log:
2008-07-08  Christian Neumair  <cneumair gnome org>

	* gtk/gtkuimanager.c (update_node):
	Skip update of accelerator child node if it has no associated action.
	Fixes #541950.


Modified:
   trunk/ChangeLog
   trunk/gtk/gtkuimanager.c

Modified: trunk/gtk/gtkuimanager.c
==============================================================================
--- trunk/gtk/gtkuimanager.c	(original)
+++ trunk/gtk/gtkuimanager.c	Mon Jul  7 23:17:40 2008
@@ -2736,7 +2736,7 @@
 	gtk_widget_destroy (info->proxy);
       if (info->extra)
 	gtk_widget_destroy (info->extra);
-      if (info->type == NODE_TYPE_ACCELERATOR)
+      if (info->type == NODE_TYPE_ACCELERATOR && info->action != NULL)
 	gtk_action_disconnect_accelerator (info->action);
       free_node (node);
       g_node_destroy (node);