[Telepathy-commits] [telepathy-salut/master] salut_muc_manager_request: use create_tubes_channel so the text channel is created if needed

Guillaume Desmottes guillaume.desmottes at collabora.co.uk
Tue Nov 25 07:09:33 PST 2008


---
 src/salut-muc-manager.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/salut-muc-manager.c b/src/salut-muc-manager.c
index 51bb4f7..6d9c1fc 100644
--- a/src/salut-muc-manager.c
+++ b/src/salut-muc-manager.c
@@ -834,10 +834,11 @@ salut_muc_manager_request (SalutMucManager *self,
         }
       else
         {
-          text_chan = g_hash_table_lookup (priv->text_channels,
-              GINT_TO_POINTER (handle));
-          tubes_chan = new_tubes_channel (self, handle, text_chan,
-              base_conn->self_handle);
+          tubes_chan = create_tubes_channel (self, handle,
+              base_conn->self_handle, &error);
+          if (tubes_chan == NULL)
+            goto error;
+
           salut_muc_manager_associate_request (self, tubes_chan,
               request_token);
           salut_muc_manager_emit_new_channel (self,
-- 
1.5.6.5




More information about the Telepathy-commits mailing list