summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2012-03-20 19:01:46 -0400
committerJonny Lamb <jonny.lamb@collabora.co.uk>2012-05-18 09:09:45 +0100
commita71f4c62ac847c8d2cf78cb6b7db62786b82dd1b (patch)
tree453d5c560e962664df2caaeed20ebddb977c928f
parentf9eca443d693dbde73e92cd7a2eee6980b69114f (diff)
private-tubes-factory: remove some duplication
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
-rw-r--r--src/private-tubes-factory.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/src/private-tubes-factory.c b/src/private-tubes-factory.c
index 20b6d7069..5b068c5a3 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;
}