telepathy-salut: tubes-manager: replace emit_new_channels with singular version

Jonny Lamb jonny at kemper.freedesktop.org
Tue Aug 28 06:30:46 PDT 2012


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

Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
Date:   Wed Jun  6 11:53:17 2012 +0100

tubes-manager: replace emit_new_channels with singular version

We're signalling the creation of only one channel anyway.

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

---

 src/tubes-manager.c |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/tubes-manager.c b/src/tubes-manager.c
index b3a1136..07b2ca6 100644
--- a/src/tubes-manager.c
+++ b/src/tubes-manager.c
@@ -816,7 +816,6 @@ salut_tubes_manager_requestotron (SalutTubesManager *self,
   const gchar *service = NULL;
   SalutTubeIface *new_channel;
   GSList *tokens = NULL;
-  GHashTable *channels;
 
   if (tp_asv_get_uint32 (request_properties,
         TP_IFACE_CHANNEL ".TargetHandleType", NULL) != TP_HANDLE_TYPE_CONTACT)
@@ -907,16 +906,12 @@ salut_tubes_manager_requestotron (SalutTubesManager *self,
           request_properties);
       g_assert (new_channel != NULL);
 
-      channels = g_hash_table_new_full (g_direct_hash, g_direct_equal,
-          NULL, NULL);
-
       if (request_token != NULL)
         tokens = g_slist_prepend (NULL, request_token);
 
-      g_hash_table_insert (channels, new_channel, tokens);
-      tp_channel_manager_emit_new_channels (self, channels);
+      tp_channel_manager_emit_new_channel (self,
+          TP_EXPORTABLE_CHANNEL (new_channel), tokens);
 
-      g_hash_table_unref (channels);
       g_slist_free (tokens);
     }
   else



More information about the telepathy-commits mailing list