diff options
author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2012-05-25 17:32:39 +0100 |
---|---|---|
committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2012-05-31 13:52:39 +0100 |
commit | a54df636478156095a76548c1a2fc2130282b74b (patch) | |
tree | e03ed6aaba100cae1807f470cdbe047c87c81218 /src/muc-manager.c | |
parent | dcd1a084679d113b3b9b63bcb7df526f1b86cc1b (diff) | |
download | telepathy-salut-a54df636478156095a76548c1a2fc2130282b74b.tar.gz |
muc-manager: store Tube channels here
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Diffstat (limited to 'src/muc-manager.c')
-rw-r--r-- | 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 c502c92d..f160a994 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 |