From 3d7f0590870d76b61d1645fef6eb099445b11073 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 11 Sep 2014 20:42:12 -0400
Subject: [PATCH] GtkStackSwitcher: More disconnect fixes

When resetting the stack, don't forget to disconnect signals.

https://bugzilla.gnome.org/show_bug.cgi?id=736307
---
 gtk/gtkstackswitcher.c | 54 ++++++++++++++++++++++--------------------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/gtk/gtkstackswitcher.c b/gtk/gtkstackswitcher.c
index 44fc7c8191..9a114bcb43 100644
--- a/gtk/gtkstackswitcher.c
+++ b/gtk/gtkstackswitcher.c
@@ -77,12 +77,6 @@ gtk_stack_switcher_init (GtkStackSwitcher *switcher)
   gtk_orientable_set_orientation (GTK_ORIENTABLE (switcher), GTK_ORIENTATION_HORIZONTAL);
 }
 
-static void
-clear_switcher (GtkStackSwitcher *self)
-{
-  gtk_container_foreach (GTK_CONTAINER (self), (GtkCallback) gtk_widget_destroy, self);
-}
-
 static void
 on_button_clicked (GtkWidget        *widget,
                    GtkStackSwitcher *self)
@@ -242,8 +236,8 @@ on_needs_attention_updated (GtkWidget        *widget,
 }
 
 static void
-add_child (GtkStackSwitcher *self,
-           GtkWidget        *widget)
+add_child (GtkWidget        *widget,
+           GtkStackSwitcher *self)
 {
   GtkWidget *button;
   GList *group;
@@ -277,10 +271,21 @@ add_child (GtkStackSwitcher *self,
 }
 
 static void
-foreach_stack (GtkWidget        *widget,
-               GtkStackSwitcher *self)
+remove_child (GtkWidget        *widget,
+              GtkStackSwitcher *self)
 {
-  add_child (self, widget);
+  GtkWidget *button;
+  GtkStackSwitcherPrivate *priv;
+
+  priv = gtk_stack_switcher_get_instance_private (self);
+
+  g_signal_handlers_disconnect_by_func (widget, on_title_icon_visible_updated, self);
+  g_signal_handlers_disconnect_by_func (widget, on_position_updated, self);
+  g_signal_handlers_disconnect_by_func (widget, on_needs_attention_updated, self);
+
+  button = g_hash_table_lookup (priv->buttons, widget);
+  gtk_container_remove (GTK_CONTAINER (self), button);
+  g_hash_table_remove (priv->buttons, widget);
 }
 
 static void
@@ -289,7 +294,16 @@ populate_switcher (GtkStackSwitcher *self)
   GtkStackSwitcherPrivate *priv;
 
   priv = gtk_stack_switcher_get_instance_private (self);
-  gtk_container_foreach (GTK_CONTAINER (priv->stack), (GtkCallback)foreach_stack, self);
+  gtk_container_foreach (GTK_CONTAINER (priv->stack), (GtkCallback)add_child, self);
+}
+
+static void
+clear_switcher (GtkStackSwitcher *self)
+{
+  GtkStackSwitcherPrivate *priv;
+
+  priv = gtk_stack_switcher_get_instance_private (self);
+  gtk_container_foreach (GTK_CONTAINER (priv->stack), (GtkCallback)remove_child, self);
 }
 
 static void
@@ -318,7 +332,7 @@ on_stack_child_added (GtkContainer     *container,
                       GtkWidget        *widget,
                       GtkStackSwitcher *self)
 {
-  add_child (self, widget);
+  add_child (widget, self);
 }
 
 static void
@@ -326,18 +340,7 @@ on_stack_child_removed (GtkContainer     *container,
                         GtkWidget        *widget,
                         GtkStackSwitcher *self)
 {
-  GtkWidget *button;
-  GtkStackSwitcherPrivate *priv;
-
-  priv = gtk_stack_switcher_get_instance_private (self);
-
-  g_signal_handlers_disconnect_by_func (widget, on_title_icon_visible_updated, self);
-  g_signal_handlers_disconnect_by_func (widget, on_position_updated, self);
-  g_signal_handlers_disconnect_by_func (widget, on_needs_attention_updated, self);
-
-  button = g_hash_table_lookup (priv->buttons, widget);
-  gtk_container_remove (GTK_CONTAINER (self), button);
-  g_hash_table_remove (priv->buttons, widget);
+  remove_child (widget, self);
 }
 
 static void
@@ -397,7 +400,6 @@ gtk_stack_switcher_set_stack (GtkStackSwitcher *switcher,
       clear_switcher (switcher);
       g_clear_object (&priv->stack);
     }
-
   if (stack)
     {
       priv->stack = g_object_ref (stack);