[Telepathy-commits] [telepathy-gabble/master] tubes-channel: wait than the tube is offered before adding us to dbus names
Guillaume Desmottes
guillaume.desmottes at collabora.co.uk
Tue Feb 3 09:06:05 PST 2009
---
src/tubes-channel.c | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/tubes-channel.c b/src/tubes-channel.c
index 1ef0c24..081952a 100644
--- a/src/tubes-channel.c
+++ b/src/tubes-channel.c
@@ -516,6 +516,11 @@ tube_offered_cb (GabbleTubeIface *tube,
update_tubes_presence (self);
+ if (type == TP_TUBE_TYPE_DBUS)
+ {
+ add_yourself_in_dbus_names (self, tube_id);
+ }
+
g_free (service);
g_hash_table_destroy (parameters);
}
@@ -575,12 +580,6 @@ create_new_tube (GabbleTubesChannel *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
More information about the telepathy-commits
mailing list