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

[matthiasc svn gnome org]

Author: matthiasc
Date: Fri Sep 12 03:05:52 2008
New Revision: 21354
URL: http://svn.gnome.org/viewvc/gtk+?rev=21354&view=rev

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



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 Sep 12 03:05:52 2008
@@ -2725,7 +2725,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);