[telepathy-salut/master] call update_tubes_info once the tube has been opened

Guillaume Desmottes guillaume.desmottes at collabora.co.uk
Fri Jun 26 07:28:14 PDT 2009


We just have to upgrade our tubes announcements when a tube has been
offered or when one has been opened.
---
 src/salut-tubes-channel.c |   12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/salut-tubes-channel.c b/src/salut-tubes-channel.c
index 3adde75..403de5b 100644
--- a/src/salut-tubes-channel.c
+++ b/src/salut-tubes-channel.c
@@ -1251,6 +1251,8 @@ tube_opened_cb (SalutTubeIface *tube,
       add_yourself_in_dbus_names (self, tube_id);
     }
 
+  update_tubes_info (self);
+
   tp_svc_channel_type_tubes_emit_tube_state_changed (self, tube_id,
       TP_TUBE_STATE_OPEN);
 }
@@ -1332,12 +1334,6 @@ create_new_tube (SalutTubesChannel *self,
 
   g_object_get (tube, "state", &state, NULL);
 
-  if (state == TP_TUBE_CHANNEL_STATE_OPEN)
-    {
-      /* FIXME: does it still make sense to call it here? */
-      update_tubes_info (self);
-    }
-
   /* The old API doesn't know the "not offered" state, so we have to wait that
    * the tube is offered before announcing it. */
   if (state != TP_TUBE_CHANNEL_STATE_NOT_OFFERED)
@@ -1727,8 +1723,6 @@ salut_tubes_channel_accept_d_bus_tube (TpSvcChannelTypeTubes *iface,
 
   salut_tube_iface_accept (tube, NULL);
 
-  update_tubes_info (self);
-
   g_object_get (tube,
       "dbus-address", &addr,
       NULL);
@@ -2270,8 +2264,6 @@ salut_tubes_channel_accept_stream_tube (TpSvcChannelTypeTubes *iface,
       return;
     }
 
-  update_tubes_info (self);
-
   g_object_get (tube, "address", &address, NULL);
 
   tp_svc_channel_type_tubes_return_from_accept_stream_tube (context,
-- 
1.5.6.5




More information about the telepathy-commits mailing list