callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GtkStackSwitcher: More disconnect fixes

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

https://bugzilla.gnome.org/show_bug.cgi?id=736307
This commit is contained in:
Matthias Clasen
2014-09-11 20:42:12 -04:00
parent 6573cebe71
commit 3d7f059087
1 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
gtk/gtkstackswitcher.c
View File

@ -77,12 +77,6 @@ gtk_stack_switcher_init (GtkStackSwitcher *switcher)
gtk_orientable_set_orientation (GTK_ORIENTABLE (switcher), GTK_ORIENTATION_HORIZONTAL); 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 static void
on_button_clicked (GtkWidget *widget, on_button_clicked (GtkWidget *widget,
GtkStackSwitcher *self) GtkStackSwitcher *self)
@ -242,8 +236,8 @@ on_needs_attention_updated (GtkWidget *widget,
} }
static void static void
add_child (GtkStackSwitcher *self, add_child (GtkWidget *widget,
GtkWidget *widget) GtkStackSwitcher *self)
{ {
GtkWidget *button; GtkWidget *button;
GList *group; GList *group;
@ -277,10 +271,21 @@ add_child (GtkStackSwitcher *self,
} }
static void static void
foreach_stack (GtkWidget *widget, remove_child (GtkWidget *widget,
GtkStackSwitcher *self) 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 static void
@ -289,7 +294,16 @@ populate_switcher (GtkStackSwitcher *self)
GtkStackSwitcherPrivate *priv; GtkStackSwitcherPrivate *priv;
priv = gtk_stack_switcher_get_instance_private (self); 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 static void
@ -318,7 +332,7 @@ on_stack_child_added (GtkContainer *container,
GtkWidget *widget, GtkWidget *widget,
GtkStackSwitcher *self) GtkStackSwitcher *self)
{ {
add_child (self, widget); add_child (widget, self);
} }
static void static void
@ -326,18 +340,7 @@ on_stack_child_removed (GtkContainer *container,
GtkWidget *widget, GtkWidget *widget,
GtkStackSwitcher *self) GtkStackSwitcher *self)
{ {
GtkWidget *button; remove_child (widget, self);
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 static void
@ -397,7 +400,6 @@ gtk_stack_switcher_set_stack (GtkStackSwitcher *switcher,
clear_switcher (switcher); clear_switcher (switcher);
g_clear_object (&priv->stack); g_clear_object (&priv->stack);
} }
if (stack) if (stack)
{ {
priv->stack = g_object_ref (stack); priv->stack = g_object_ref (stack);