[Telepathy-commits] [telepathy-salut/master] incoming_pending_connection_stream_opened_cb: early return if we got a from attribute as we don't have to do the iChat special crack

[Guillaume Desmottes]

---
 src/salut-xmpp-connection-manager.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/salut-xmpp-connection-manager.c b/src/salut-xmpp-connection-manager.c
index 3bc15f0..80fd339 100644
--- a/src/salut-xmpp-connection-manager.c
+++ b/src/salut-xmpp-connection-manager.c
@@ -722,7 +722,10 @@ incoming_pending_connection_stream_opened_cb (GibberXmppConnection *conn,
    * support that yet.
    * */
   if (from != NULL)
-    incoming_pending_connection_got_from (self, conn, from);
+    {
+      incoming_pending_connection_got_from (self, conn, from);
+      return;
+    }
 
   /* If it's a transport to just one contacts machine, hook it up right away.
    * This is needed because iChat doesn't send message with to and
-- 
1.5.6.5