[seahorse] Drop signal handlers in SeahorseCollection when disposing

[Stefan Walter <stefw src gnome org>]

commit c5c3f4c74839831ab2d77523e514ad0658576b00
Author: Stef Walter <stefw collabora co uk>
Date:   Mon Dec 19 11:52:39 2011 +0100

    Drop signal handlers in SeahorseCollection when disposing

 libseahorse/seahorse-collection.c |   23 ++++++++++-------------
 1 files changed, 10 insertions(+), 13 deletions(-)
---
diff --git a/libseahorse/seahorse-collection.c b/libseahorse/seahorse-collection.c
index 936a346..cfdf3b6 100644
--- a/libseahorse/seahorse-collection.c
+++ b/libseahorse/seahorse-collection.c
@@ -49,16 +49,6 @@ G_DEFINE_TYPE_WITH_CODE (SeahorseCollection, seahorse_collection, G_TYPE_OBJECT,
                          G_IMPLEMENT_INTERFACE (GCR_TYPE_COLLECTION, seahorse_collection_iface_init);
 );
 
-static gboolean
-remove_update (GObject *object,
-               gpointer unused,
-               SeahorseCollection *self)
-{
-	gcr_collection_emit_removed (GCR_COLLECTION (self), object);
-	return TRUE;
-}
-
-
 static void
 on_object_changed (GObject *obj,
                    GParamSpec *spec,
@@ -76,7 +66,7 @@ remove_object (SeahorseCollection *self,
                GObject *object)
 {
 	g_hash_table_remove (self->pv->objects, object);
-	remove_update (object, NULL, self);
+	gcr_collection_emit_removed (GCR_COLLECTION (self), object);
 }
 
 static gboolean
@@ -169,12 +159,19 @@ static void
 seahorse_collection_dispose (GObject *obj)
 {
 	SeahorseCollection *self = SEAHORSE_COLLECTION (obj);
+	GHashTableIter iter;
+	GObject *object;
 
 	g_signal_handlers_disconnect_by_func (self->pv->base, on_base_added, self);
 	g_signal_handlers_disconnect_by_func (self->pv->base, on_base_removed, self);
 
-	/* Release all our pointers and stuff */
-	g_hash_table_foreach_remove (self->pv->objects, (GHRFunc)remove_update, self);
+	g_hash_table_iter_init (&iter, self->pv->objects);
+	while (g_hash_table_iter_next (&iter, (gpointer *)&object, NULL)) {
+		g_signal_handlers_disconnect_by_func (object, on_object_changed, self);
+		gcr_collection_emit_removed (GCR_COLLECTION (self), object);
+	}
+
+	g_hash_table_remove_all (self->pv->objects);
 
 	G_OBJECT_CLASS (seahorse_collection_parent_class)->dispose (obj);
 }