diff options
| author | Simon Schampijer <simon@schampijer.de> | 2007-08-29 07:57:35 (GMT) |
|---|---|---|
| committer | Simon Schampijer <simon@schampijer.de> | 2007-08-29 07:57:35 (GMT) |
| commit | ef7033e5e7b1adf9f0bd8c8770b8ed592a58cb47 (patch) | |
| tree | dce0d6b9db26e1e23355dd54ae013d204b88c93c /activity.py | |
| parent | aab784280a3b26568558589c9e3bf8a31df6c11c (diff) | |
Adopted memorize to the new tubes API.
Diffstat (limited to 'activity.py')
| -rwxr-xr-x | activity.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/activity.py b/activity.py index 849f87a..33cefe8 100755 --- a/activity.py +++ b/activity.py @@ -38,8 +38,7 @@ import game import messenger import memorizetoolbar -# will eventually be imported from telepathy.tubes or something -from tubeconn import TubeConnection +from sugar.presence.tubeconn import TubeConnection SERVICE = "org.laptop.Memorize" IFACE = SERVICE @@ -145,8 +144,8 @@ class MemorizeActivity(Activity): self._shared_activity.connect('buddy-left', self._buddy_left_cb) _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, {}) def _setup(self): if self._shared_activity is None: @@ -237,7 +236,7 @@ class MemorizeActivity(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) self.tube_conn = TubeConnection(self.conn, self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES], |