[Telepathy-commits] [telepathy-salut/master] salut_tubes_channel_message_received now returns the newly created channel so caller can announce it

[Guillaume Desmottes]

---
 src/salut-tubes-channel.c |   10 ++++++++--
 src/salut-tubes-channel.h |    2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/salut-tubes-channel.c b/src/salut-tubes-channel.c
index c5713c6..e2b6976 100644
--- a/src/salut-tubes-channel.c
+++ b/src/salut-tubes-channel.c
@@ -951,7 +951,11 @@ salut_tubes_channel_muc_message_received (SalutTubesChannel *self,
 }
 
 /* 1-1 message */
-void
+
+/* Return a newly created SalutTubeIface channel if it has been created
+ * due to this message. This channel has not been announced yet
+ * so it's the responsability of the caller to announce it. */
+SalutTubeIface *
 salut_tubes_channel_message_received (SalutTubesChannel *self,
                                       const gchar *service,
                                       TpTubeType tube_type,
@@ -962,7 +966,6 @@ salut_tubes_channel_message_received (SalutTubesChannel *self,
                                       GibberXmppStanza *iq_req)
 {
   SalutTubesChannelPrivate *priv = SALUT_TUBES_CHANNEL_GET_PRIVATE (self);
-
   SalutTubeIface *tube;
 
   /* do we already know this tube? */
@@ -971,7 +974,10 @@ salut_tubes_channel_message_received (SalutTubesChannel *self,
     {
       tube = create_new_tube (self, tube_type, initiator_handle, FALSE,
           service, parameters, tube_id, portnum, iq_req);
+      return tube;
     }
+
+  return NULL;
 }
 
 void
diff --git a/src/salut-tubes-channel.h b/src/salut-tubes-channel.h
index e463caf..8804696 100644
--- a/src/salut-tubes-channel.h
+++ b/src/salut-tubes-channel.h
@@ -77,7 +77,7 @@ void salut_tubes_channel_bytestream_offered (SalutTubesChannel *chanel,
 void salut_tubes_channel_muc_message_received (SalutTubesChannel *channel,
     const gchar *sender, GibberXmppStanza *stanza);
 
-void salut_tubes_channel_message_received (SalutTubesChannel *self,
+SalutTubeIface * salut_tubes_channel_message_received (SalutTubesChannel *self,
     const gchar *service, TpTubeType tube_type, TpHandle initiator_handle,
     GHashTable *parameters, guint tube_id, guint portnum,
     GibberXmppStanza *iq_req);
-- 
1.5.6.5