summaryrefslogtreecommitdiff
path: root/gtk/gtkuimanager.c
diff options
context:
space:
mode:
authorChristian Neumair <cneumair@gnome.org>2008-07-07 23:17:40 +0000
committerChristian Neumair <cneumair@src.gnome.org>2008-07-07 23:17:40 +0000
commit2271df7c8df6dafee31e35e3d1394d02c0858d93 (patch)
tree0e6cdf7e6e7490370b80816ebac5f48dfa3850d0 /gtk/gtkuimanager.c
parent6301e719792be1cc5abf0cd9cc8abc89945fec98 (diff)
downloadgtk+-2271df7c8df6dafee31e35e3d1394d02c0858d93.tar.gz
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
Diffstat (limited to 'gtk/gtkuimanager.c')
-rw-r--r--gtk/gtkuimanager.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c
index 256e416e19..33c71efbc6 100644
--- 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);