[Telepathy-commits] [telepathy-gabble/master] move disposing of connection's OLPC structures to conn_olpc_activity_properties_dispose

[Guillaume Desmottes]

20080729142550-7fe3f-b20a4e034b6a7b715f7b5e4b3d0afb068df318ca.gz
---
 src/conn-olpc.c  |   10 ++++++++++
 src/conn-olpc.h  |    5 +++--
 src/connection.c |    6 +-----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/conn-olpc.c b/src/conn-olpc.c
index e2a487d..c544b30 100644
--- a/src/conn-olpc.c
+++ b/src/conn-olpc.c
@@ -3665,6 +3665,16 @@ conn_olpc_activity_properties_init (GabbleConnection *conn)
 }
 
 void
+conn_olpc_activity_properties_dispose (GabbleConnection *self)
+{
+  g_hash_table_destroy (self->olpc_current_act);
+  g_hash_table_destroy (self->olpc_pep_activities);
+  g_hash_table_destroy (self->olpc_invited_activities);
+  g_hash_table_destroy (self->olpc_views);
+  g_hash_table_destroy (self->olpc_activities_info);
+}
+
+void
 olpc_activity_properties_iface_init (gpointer g_iface,
                                      gpointer iface_data)
 {
diff --git a/src/conn-olpc.h b/src/conn-olpc.h
index 2fc7e06..821535b 100644
--- a/src/conn-olpc.h
+++ b/src/conn-olpc.h
@@ -48,8 +48,9 @@ void gabble_connection_connected_olpc (GabbleConnection *conn);
 void
 olpc_activity_properties_iface_init (gpointer g_iface, gpointer iface_data);
 
-void
-conn_olpc_activity_properties_init (GabbleConnection *conn);
+void conn_olpc_activity_properties_init (GabbleConnection *conn);
+
+void conn_olpc_activity_properties_dispose (GabbleConnection *conn);
 
 gboolean conn_olpc_process_activity_properties_message (GabbleConnection *conn,
     LmMessage *msg, const gchar *from);
diff --git a/src/connection.c b/src/connection.c
index 1c97a28..5a786e4 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -752,11 +752,7 @@ gabble_connection_dispose (GObject *object)
   g_object_unref (self->presence_cache);
   self->presence_cache = NULL;
 
-  g_hash_table_destroy (self->olpc_current_act);
-  g_hash_table_destroy (self->olpc_pep_activities);
-  g_hash_table_destroy (self->olpc_invited_activities);
-  g_hash_table_destroy (self->olpc_views);
-  g_hash_table_destroy (self->olpc_activities_info);
+  conn_olpc_activity_properties_dispose (self);
 
   g_hash_table_destroy (self->avatar_requests);
 
-- 
1.5.6.5