summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Lortie <desrt@desrt.ca>2012-08-23 08:18:11 -0400
committerRyan Lortie <desrt@desrt.ca>2012-08-23 08:18:11 -0400
commit828a97d7739e04e12ef7a5cb91405ab804f03d2a (patch)
treeaf149d7720864f72d3b21ab2b58d1f5eb3a5f2e2
parent820b0cafe0397ba4cdd23bfbfcb873afad2a9fd0 (diff)
downloadgtk+-828a97d7739e04e12ef7a5cb91405ab804f03d2a.tar.gz
GtkWidget: fix insert_action_group(NULL)
gtk_widget_insert_action_group (widget, "foo", NULL) is valid, but g_action_muxer_insert (muxer, "foo", NULL) is not. Use g_action_muxer_remove() for that case.
-rw-r--r--gtk/gtkwidget.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 629484e6e4..f624250f70 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -14138,5 +14138,8 @@ gtk_widget_insert_action_group (GtkWidget *widget,
muxer = _gtk_widget_get_action_muxer (widget);
- g_action_muxer_insert (muxer, name, group);
+ if (group)
+ g_action_muxer_insert (muxer, name, group);
+ else
+ g_action_muxer_remove (muxer, name);
}