telepathy-gabble: private-tubes-factory: remove some duplication

Jonny Lamb jonny at kemper.freedesktop.org
Tue Aug 28 06:19:31 PDT 2012


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

Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
Date:   Tue Mar 20 19:01:46 2012 -0400

private-tubes-factory: remove some duplication

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

---

 src/private-tubes-factory.c |   15 +++------------
 1 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/private-tubes-factory.c b/src/private-tubes-factory.c
index 20b6d70..5b068c5 100644
--- a/src/private-tubes-factory.c
+++ b/src/private-tubes-factory.c
@@ -737,12 +737,6 @@ gabble_private_tubes_factory_handle_si_tube_request (
   /* New tube */
   tube = new_channel_from_stanza (self, msg, tube_node,
       tube_id, bytestream);
-
-  if (tube != NULL)
-    {
-      tp_channel_manager_emit_new_channel (self,
-          TP_EXPORTABLE_CHANNEL (tube), NULL);
-    }
 }
 
 void
@@ -917,12 +911,6 @@ private_tubes_factory_msg_tube_cb (
 
   channel = new_channel_from_stanza (self, msg, node, tube_id, NULL);
 
-  if (channel != NULL)
-    {
-      tp_channel_manager_emit_new_channel (self,
-          TP_EXPORTABLE_CHANNEL (channel), NULL);
-    }
-
   return TRUE;
 }
 
@@ -1227,6 +1215,9 @@ new_channel_from_stanza (GabblePrivateTubesFactory *self,
 
   g_hash_table_unref (parameters);
 
+  tp_channel_manager_emit_new_channel (self,
+      TP_EXPORTABLE_CHANNEL (tube), NULL);
+
   return tube;
 }
 



More information about the telepathy-commits mailing list