[telepathy-salut/master] tubes-channel: call add_yourself_in_dbus_names once the tube has been opened

[Guillaume Desmottes]

---
 src/salut-tubes-channel.c |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/salut-tubes-channel.c b/src/salut-tubes-channel.c
index 6f76b74..3adde75 100644
--- a/src/salut-tubes-channel.c
+++ b/src/salut-tubes-channel.c
@@ -1239,8 +1239,17 @@ tube_opened_cb (SalutTubeIface *tube,
 {
   SalutTubesChannel *self = SALUT_TUBES_CHANNEL (user_data);
   guint tube_id;
+  TpTubeType type;
 
-  g_object_get (tube, "id", &tube_id, NULL);
+  g_object_get (tube,
+      "id", &tube_id,
+      "type", &type,
+      NULL);
+
+  if (type == TP_TUBE_TYPE_DBUS)
+    {
+      add_yourself_in_dbus_names (self, tube_id);
+    }
 
   tp_svc_channel_type_tubes_emit_tube_state_changed (self, tube_id,
       TP_TUBE_STATE_OPEN);
@@ -1342,12 +1351,6 @@ create_new_tube (SalutTubesChannel *self,
           state);
     }
 
-  if (type == TP_TUBE_TYPE_DBUS &&
-      state != TP_TUBE_STATE_LOCAL_PENDING)
-    {
-      add_yourself_in_dbus_names (self, tube_id);
-    }
-
   g_signal_connect (tube, "tube-opened", G_CALLBACK (tube_opened_cb), self);
   g_signal_connect (tube, "tube-closed", G_CALLBACK (tube_closed_cb), self);
   g_signal_connect (tube, "tube-offered", G_CALLBACK (tube_offered_cb), self);
-- 
1.5.6.5