AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

GActionMuxer: disconnect group signals on finalize

Browse Source 
The signals for the action group were being disconnected when the action
group was explicitly removed from the GActionMuxer but the same was not
being done when it was finalized.

This means that a change in the state of an action group that used to be
associated with a finalized GActionMuxer would result in a crash.  This
would happen for stateful application actions after closing a window.
This commit is contained in:
Ryan Lortie 2012-06-28 23:55:33 -04:00 committed by Tiffany Antopolski
parent 6f86bd5f0c
commit 6e11c3106a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gtk/gactionmuxer.c
View File

@ -352,6 +352,11 @@ static void
g_action_muxer_free_group (gpointer data) g_action_muxer_free_group (gpointer data)
{ {
Group *group = data; Group *group = data;
gint i;
/* 'for loop' or 'four loop'? */
for (i = 0; i < 4; i++)
g_signal_handler_disconnect (group->group, group->handler_ids[i]);
g_object_unref (group->group); g_object_unref (group->group);
g_free (group->prefix); g_free (group->prefix);
@ -485,10 +490,6 @@ g_action_muxer_remove (GActionMuxer *muxer,
g_action_muxer_action_removed (group->group, actions[i], group); g_action_muxer_action_removed (group->group, actions[i], group);
g_strfreev (actions); g_strfreev (actions);
/* 'for loop' or 'four loop'? */
for (i = 0; i < 4; i++)
g_signal_handler_disconnect (group->group, group->handler_ids[i]);
g_action_muxer_free_group (group); g_action_muxer_free_group (group);
} }
} }