[Telepathy-commits] [telepathy-gabble/master] Update Tube and DBusTube specs to newer draft

Will Thompson will.thompson at collabora.co.uk
Tue Feb 3 03:36:39 PST 2009


Also change OfferDBusTube implementation to return the DBus server's
socket address.
---
 extensions/all.xml |    2 +-
 src/tube-dbus.c    |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/extensions/all.xml b/extensions/all.xml
index a19591a..a4a624b 100644
--- a/extensions/all.xml
+++ b/extensions/all.xml
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</p>
     from="Telepathy specification"/>
   <tp:external-type name="Contact_Handle" type="u"
     from="Telepathy specification"/>
-  <tp:simple-type name="DBus_Unique_Name" type="s"
+  <tp:external-type name="DBus_Unique_Name" type="s"
     from="Telepathy specification"/>
 </tp:generic-types>
 
diff --git a/src/tube-dbus.c b/src/tube-dbus.c
index 1712221..e82cebd 100644
--- a/src/tube-dbus.c
+++ b/src/tube-dbus.c
@@ -1796,7 +1796,8 @@ gabble_tube_dbus_offer_d_bus_tube (GabbleSvcChannelTypeDBusTube *self,
 
   if (gabble_tube_dbus_offer (tube, &error))
     {
-      gabble_svc_channel_type_dbus_tube_return_from_offer_d_bus_tube (context);
+      gabble_svc_channel_type_dbus_tube_return_from_offer_d_bus_tube (context,
+          tube->priv->dbus_srv_addr);
     }
   else
     {
-- 
1.5.6.5




More information about the telepathy-commits mailing list