summaryrefslogtreecommitdiff
path: root/gtk/gtkactionmuxer.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2019-06-30 18:35:28 +0000
committerMatthias Clasen <mclasen@redhat.com>2019-06-30 18:37:32 +0000
commit3b6ee32f83882c8c2c736c7bb504a47bf1fdf407 (patch)
tree587499bc130f290aaa65d196a34037674a9b4a5d /gtk/gtkactionmuxer.c
parent3bc3e140ddee3f274f0797c10cf7e33dd1b32074 (diff)
downloadgtk+-3b6ee32f83882c8c2c736c7bb504a47bf1fdf407.tar.gz
Fix a crash in action muxer destruction
I've seen a crash when the action muxer gets disposed during widget destroy, and tries to disconnect from widget signals too late. There is no real need to disconnect, since the only time an action muxer is going away is when its widget is destroyed, so just don't do it.
Diffstat (limited to 'gtk/gtkactionmuxer.c')
-rw-r--r--gtk/gtkactionmuxer.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/gtk/gtkactionmuxer.c b/gtk/gtkactionmuxer.c
index 23c4f56a5a..6b4fb9a654 100644
--- a/gtk/gtkactionmuxer.c
+++ b/gtk/gtkactionmuxer.c
@@ -561,13 +561,6 @@ prop_actions_connect (GtkActionMuxer *muxer)
}
}
-static void
-prop_actions_disconnect (GtkActionMuxer *muxer)
-{
- if (muxer->widget)
- g_signal_handlers_disconnect_by_func (muxer->widget,
- prop_action_notify, muxer);
-}
static gboolean
gtk_action_muxer_query_action (GActionGroup *action_group,
@@ -819,8 +812,6 @@ gtk_action_muxer_dispose (GObject *object)
{
GtkActionMuxer *muxer = GTK_ACTION_MUXER (object);
- prop_actions_disconnect (muxer);
-
if (muxer->parent)
{
g_signal_handlers_disconnect_by_func (muxer->parent, gtk_action_muxer_action_added_to_parent, muxer);