From e4d1085846020f3522f94e1cb075b7d9417b9cea Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Mon, 10 Sep 2012 11:14:22 +0200 Subject: [PATCH] roster-view: clear the view when disposing https://bugzilla.gnome.org/show_bug.cgi?id=683699 --- libempathy-gtk/empathy-roster-view.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/libempathy-gtk/empathy-roster-view.c b/libempathy-gtk/empathy-roster-view.c index 8c2c277b..a5d14594 100644 --- a/libempathy-gtk/empathy-roster-view.c +++ b/libempathy-gtk/empathy-roster-view.c @@ -1045,6 +1045,17 @@ empathy_roster_view_constructed (GObject *object) egg_list_box_set_activate_on_single_click (EGG_LIST_BOX (self), FALSE); } +static void +clear_view (EmpathyRosterView *self) +{ + g_hash_table_remove_all (self->priv->roster_contacts); + g_hash_table_remove_all (self->priv->roster_groups); + g_hash_table_remove_all (self->priv->displayed_contacts); + + gtk_container_foreach (GTK_CONTAINER (self), + (GtkCallback) gtk_widget_destroy, NULL); +} + static void empathy_roster_view_dispose (GObject *object) { @@ -1052,6 +1063,10 @@ empathy_roster_view_dispose (GObject *object) void (*chain_up) (GObject *) = ((GObjectClass *) empathy_roster_view_parent_class)->dispose; + /* Start by clearing the view so our internal hash tables are cleared from + * objects being destroyed. */ + clear_view (self); + stop_flashing (self); empathy_roster_view_set_live_search (self, NULL); @@ -1377,17 +1392,6 @@ empathy_roster_view_show_offline (EmpathyRosterView *self, g_object_notify (G_OBJECT (self), "show-offline"); } -static void -clear_view (EmpathyRosterView *self) -{ - g_hash_table_remove_all (self->priv->roster_contacts); - g_hash_table_remove_all (self->priv->roster_groups); - g_hash_table_remove_all (self->priv->displayed_contacts); - - gtk_container_foreach (GTK_CONTAINER (self), - (GtkCallback) gtk_widget_destroy, NULL); -} - void empathy_roster_view_show_groups (EmpathyRosterView *self, gboolean show) -- 2.39.2