From 2b5e3b32e2278b9dbeb2963f74804f7fbe0eaf24 Mon Sep 17 00:00:00 2001
From: Marc Maurer <uwog@uwog.net>
Date: Tue, 28 Aug 2007 19:15:48 +0000
Subject: Update to new Tube API (patch from cassidy)

---
diff --git a/AbiWordActivity.py b/AbiWordActivity.py
index 5645767..e8bdc61 100644
--- a/AbiWordActivity.py
+++ b/AbiWordActivity.py
@@ -151,9 +151,10 @@ class AbiWordActivity (Activity):
         self._shared_activity.connect('buddy-left', self._buddy_left_cb)
 
         logger.debug('This is my activity: offering a tube...')
-        id = self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].OfferTube(
-            telepathy.TUBE_TYPE_DBUS, "com.abisource.abiword.abicollab", {})
-        logger.debug('Tube address: %s', self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].GetDBusServerAddress(id))
+        id = self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].OfferDBusTube(
+            \"com.abisource.abiword.abicollab\", {})
+        logger.debug(\'Tube address: %s\', self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].GetDBusTubeAddress(id))
+
 
     def _setup(self):
         logger.debug("_setup()")
@@ -232,7 +233,7 @@ class AbiWordActivity (Activity):
         if (type == telepathy.TUBE_TYPE_DBUS and
             service == "com.abisource.abiword.abicollab"):
             if state == telepathy.TUBE_STATE_LOCAL_PENDING:
-                self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].AcceptTube(id)
+                self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].AcceptDBusTube(id)
 
             initiator_path = None;
             contacts = self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].GetDBusNames(id)
@@ -249,7 +250,7 @@ class AbiWordActivity (Activity):
                 logger.error('Unable to get the dbus path of the tube initiator')
             else:
                 # pass this tube to abicollab
-                address = self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].GetDBusServerAddress(id)
+                address = self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].GetDBusTubeAddress(id)
                 if self.joined:
                     logger.debug('Passing tube address to abicollab (join): %s', address)
                     self.abiword_canvas.invoke_cmd('com.abisource.abiword.abicollab.olpc.joinTube', address, 0, 0)
diff --git a/NEWS b/NEWS
index 389163b..c51558b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+* Port to new tubes API. (cassidy)
 * Add supported mimetypes for abiword, msword, xhtml, html and rtf
 * Add a format toolbar
 * Implement basic style support
--
cgit v0.9.1