summaryrefslogtreecommitdiff
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 21:50:07 +0000
commit0426431446723d8d9727a4e73b1725d5d3fbd4c0 (patch)
tree4c577248dbd67f9941cb26db9458a7082aee57df
parentc4dbf27f154b479c9b8e8943260e4127673c29ea (diff)
downloadgtk+-0426431446723d8d9727a4e73b1725d5d3fbd4c0.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.
-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);