diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2007-08-29 17:20:46 (GMT) |
|---|---|---|
| committer | Chris Ball <cjb@pullcord.laptop.org> | 2007-08-29 17:20:46 (GMT) |
| commit | ff162612c02a284de6188585a5bdfd1d437f6365 (patch) | |
| tree | 8a9528123ab27d4f6859c3e7868c2ef7ca0a3e65 /activity.py | |
| parent | 6206c9e9d787d886a1f2c957714214492b9c08bf (diff) | |
Update to new tubes API
Diffstat (limited to 'activity.py')
| -rw-r--r-- | activity.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/activity.py b/activity.py index 9c939c6..0dbbd60 100644 --- a/activity.py +++ b/activity.py @@ -35,8 +35,7 @@ from dbus.gobject_service import ExportedGObject from sugar.activity.activity import Activity, ActivityToolbox, get_bundle_path from sugar.presence import presenceservice -# will eventually be imported from sugar -from tubeconn import TubeConnection +from sugar.presence.tubeconn import TubeConnection SERVICE = "org.laptop.Pippy" IFACE = SERVICE @@ -231,8 +230,8 @@ class PippyActivity(Activity): self._shared_activity.connect('buddy-left', self._buddy_left_cb) self._logger.debug('This is my activity: making a tube...') - id = self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].OfferTube( - telepathy.TUBE_TYPE_DBUS, SERVICE, {}) + id = self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].OfferDBusTube( + SERVICE, {}) # presence service should be tubes-aware and give us more help # with this @@ -314,7 +313,7 @@ class PippyActivity(Activity): if (type == telepathy.TUBE_TYPE_DBUS and service == SERVICE): 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) tube_conn = TubeConnection(self.conn, self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES], |