diff options
| author | Marc Maurer <uwog@uwog.net> | 2007-08-29 10:55:00 (GMT) |
|---|---|---|
| committer | Marc Maurer <uwog@uwog.net> | 2007-08-29 10:55:00 (GMT) |
| commit | 2a803c040703dc3f5b2dba24546e3397d7aba466 (patch) | |
| tree | a6947c623237bd863d6b1f29ecee230c94dc138a /AbiWordActivity.py | |
| parent | d29b27c477ae237eab0a68956dec647983f44077 (diff) | |
| parent | 2b5e3b32e2278b9dbeb2963f74804f7fbe0eaf24 (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/projects/write
Conflicts:
NEWS
Diffstat (limited to 'AbiWordActivity.py')
| -rw-r--r-- | AbiWordActivity.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/AbiWordActivity.py b/AbiWordActivity.py index 5645767..b75f99e 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) |