telepathy-salut: muc-manager: store Tube channels here

[Jonny Lamb]

Module: telepathy-salut
Branch: master
Commit: a54df636478156095a76548c1a2fc2130282b74b
URL:    http://cgit.freedesktop.org/telepathy/telepathy-salut/commit/?id=a54df636478156095a76548c1a2fc2130282b74b

Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
Date:   Fri May 25 17:32:39 2012 +0100

muc-manager: store Tube channels here

Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>

---

 src/muc-manager.c |   18 +++++-------------
 1 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/muc-manager.c b/src/muc-manager.c
index c502c92..f160a99 100644
--- a/src/muc-manager.c
+++ b/src/muc-manager.c
@@ -87,6 +87,9 @@ struct _SalutMucManagerPrivate
    /* GUINT_TO_POINTER(room_handle) => (SalutTubesChannel *) */
   GHashTable *tubes_channels;
 
+  /* tube ID => owned SalutTubeIface */
+  GHashTable *tubes;
+
   gboolean dispose_has_run;
 };
 
@@ -163,19 +166,8 @@ salut_muc_manager_close_all (SalutMucManager *self)
       priv->status_changed_id = 0;
     }
 
-  if (priv->text_channels)
-    {
-      GHashTable *tmp = priv->text_channels;
-      priv->text_channels = NULL;
-      g_hash_table_unref (tmp);
-    }
-
-  if (priv->tubes_channels != NULL)
-    {
-      GHashTable *tmp = priv->tubes_channels;
-      priv->tubes_channels = NULL;
-      g_hash_table_unref (tmp);
-    }
+  tp_clear_pointer (&priv->text_channels, g_hash_table_unref);
+  tp_clear_pointer (&priv->tubes_channels, g_hash_table_unref);
 }
 
 static void