[Telepathy-commits] [telepathy-salut/master] GibberBytestream{Direct, OOB}: check the status of the transport in set_transport

[Alban Crequy]

---
 lib/gibber/gibber-bytestream-direct.c |   11 ++++++-----
 lib/gibber/gibber-bytestream-oob.c    |   11 ++++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/lib/gibber/gibber-bytestream-direct.c b/lib/gibber/gibber-bytestream-direct.c
index 2afb317..b74ee8f 100644
--- a/lib/gibber/gibber-bytestream-direct.c
+++ b/lib/gibber/gibber-bytestream-direct.c
@@ -470,6 +470,12 @@ set_transport (GibberBytestreamDirect *self,
   priv->transport = g_object_ref (transport);
   gibber_transport_set_handler (transport, transport_handler, self);
 
+  if (gibber_transport_get_state (transport) == GIBBER_TRANSPORT_CONNECTED)
+      {
+        g_object_set (self, "state", GIBBER_BYTESTREAM_STATE_OPEN,
+            NULL);
+      }
+
   g_signal_connect (transport, "connected",
       G_CALLBACK (transport_connected_cb), self);
   g_signal_connect (transport, "disconnected",
@@ -494,11 +500,6 @@ gibber_bytestream_direct_accept_socket (GibberBytestreamIface *bytestream,
     }
 
   set_transport (self, transport);
-  if (gibber_transport_get_state (transport) == GIBBER_TRANSPORT_CONNECTED)
-      {
-        g_object_set (self, "state", GIBBER_BYTESTREAM_STATE_OPEN,
-            NULL);
-      }
 
   return TRUE;
 }
diff --git a/lib/gibber/gibber-bytestream-oob.c b/lib/gibber/gibber-bytestream-oob.c
index 05438f1..82358aa 100644
--- a/lib/gibber/gibber-bytestream-oob.c
+++ b/lib/gibber/gibber-bytestream-oob.c
@@ -230,6 +230,12 @@ set_transport (GibberBytestreamOOB *self,
   priv->transport = g_object_ref (transport);
   gibber_transport_set_handler (transport, transport_handler, self);
 
+  if (gibber_transport_get_state (transport) == GIBBER_TRANSPORT_CONNECTED)
+    {
+      g_object_set (self, "state", GIBBER_BYTESTREAM_STATE_OPEN,
+          NULL);
+    }
+
   g_signal_connect (transport, "connected",
       G_CALLBACK (transport_connected_cb), self);
   g_signal_connect (transport, "disconnected",
@@ -961,11 +967,6 @@ new_connection_cb (GibberListener *listener,
   DEBUG("New connection..");
 
   set_transport (self, transport);
-  if (gibber_transport_get_state (transport) == GIBBER_TRANSPORT_CONNECTED)
-    {
-      g_object_set (self, "state", GIBBER_BYTESTREAM_STATE_OPEN,
-          NULL);
-    }
 }
 
 /*
-- 
1.5.6.5