callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Christian Neumair 2008-07-07 23:17:40 +00:00 committed by Christian Neumair
parent 6301e71979
commit 2271df7c8d
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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

2
gtk/gtkuimanager.c
View File

@ -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);