Skip update of accelerator child node if it has no associated action.

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.

svn path=/trunk/; revision=20811

diff --git a/ChangeLog b/ChangeLog
index f7f855bb623fa9a24f3917ee8c99c5fc898f4af3..4c763940cfd1304543b459583addecd3102312e0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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.
+
 2008-07-07  Cody Russell  <bratsche@gnome.org>
 
        Bug 541964 – [Win32] Setting modal hint to current value might confuse the stack

diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c
index 256e416e1950b9814e651f69a006fe3df0dcc0e7..33c71efbc6dff723daac11b301329bef78462a4b 100644 (file)
--- a/gtk/gtkuimanager.c
+++ b/gtk/gtkuimanager.c
@@ -2736,7 +2736,7 @@ update_node (GtkUIManager *self,
        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);