diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-01-13 11:43:37 +0000 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-02-03 14:34:11 +0000 |
commit | a61f7289f0c2b972a3dc42a420815ab835c1949d (patch) | |
tree | fc1f811177ad29907fc8499a62649b2b556983b1 | |
parent | dde60dd84a389ef398e57829b6d74f40a3c11d38 (diff) | |
download | telepathy-salut-a61f7289f0c2b972a3dc42a420815ab835c1949d.tar.gz |
salut_tubes_manager_requestotron: salut_tubes_channel_tube_request is not suppose to return NULL and, anyway, it doesn't make sense to call tp_channel_manager_emit_request_already_satisfied on the tubes channel
-rw-r--r-- | src/salut-tubes-manager.c | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/src/salut-tubes-manager.c b/src/salut-tubes-manager.c index f20059ae..e0d3af98 100644 --- a/src/salut-tubes-manager.c +++ b/src/salut-tubes-manager.c @@ -952,6 +952,7 @@ salut_tubes_manager_requestotron (SalutTubesManager *self, else { SalutTubeIface *new_channel; + GSList *tokens = NULL; if (tubes_channel == NULL) { @@ -963,25 +964,15 @@ salut_tubes_manager_requestotron (SalutTubesManager *self, new_channel = salut_tubes_channel_tube_request (tubes_channel, request_token, request_properties); + g_assert (new_channel != NULL); - if (new_channel != NULL) - { - GSList *tokens = NULL; - - if (request_token != NULL) - tokens = g_slist_prepend (NULL, request_token); + if (request_token != NULL) + tokens = g_slist_prepend (NULL, request_token); - tp_channel_manager_emit_new_channel (self, - TP_EXPORTABLE_CHANNEL (new_channel), tokens); - - g_slist_free (tokens); - } - else - { - tp_channel_manager_emit_request_already_satisfied (self, - request_token, TP_EXPORTABLE_CHANNEL (tubes_channel)); - } + tp_channel_manager_emit_new_channel (self, + TP_EXPORTABLE_CHANNEL (new_channel), tokens); + g_slist_free (tokens); return TRUE; } |