diff options
| author | Dan Williams <dcbw@redhat.com> | 2007-04-09 18:40:56 (GMT) |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2007-04-09 18:40:56 (GMT) |
| commit | bc083dae5a601d9ce099496096330691efc46447 (patch) | |
| tree | ca92b000912b198bd3e791321937f863b600dd60 /sugar/activity | |
| parent | 2509d990e4837f4810a372fda40d260f32014712 (diff) | |
Cut over to new PresenceService
Diffstat (limited to 'sugar/activity')
| -rw-r--r-- | sugar/activity/activity.py | 4 | ||||
| -rw-r--r-- | sugar/activity/activityfactory.py | 4 | ||||
| -rw-r--r-- | sugar/activity/activityhandle.py | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sugar/activity/activity.py b/sugar/activity/activity.py index 20e3dcb..d6e363b 100644 --- a/sugar/activity/activity.py +++ b/sugar/activity/activity.py @@ -21,7 +21,7 @@ import os import gtk import hippo -from sugar.presence import PresenceService +from sugar.presence import presenceservice from sugar.activity.activityservice import ActivityService from sugar.graphics.window import Window @@ -35,7 +35,7 @@ class Activity(Window, gtk.Container): self._shared = False self._activity_id = handle.activity_id - self._pservice = PresenceService.get_instance() + self._pservice = presenceservice.get_instance() self._service = None service = handle.get_presence_service() diff --git a/sugar/activity/activityfactory.py b/sugar/activity/activityfactory.py index 6662ccb..c795c5d 100644 --- a/sugar/activity/activityfactory.py +++ b/sugar/activity/activityfactory.py @@ -21,7 +21,7 @@ import dbus import gobject import gtk -from sugar.presence import PresenceService +from sugar.presence import presenceservice from sugar.activity import bundleregistry from sugar.activity.activityhandle import ActivityHandle from sugar import util @@ -31,7 +31,7 @@ _ACTIVITY_SERVICE_PATH = "/org/laptop/Activity" _ACTIVITY_INTERFACE = "org.laptop.Activity" def create_activity_id(): - pservice = PresenceService.get_instance() + pservice = presenceservice.get_instance() # create a new unique activity ID i = 0 diff --git a/sugar/activity/activityhandle.py b/sugar/activity/activityhandle.py index 8044f0a..fee6327 100644 --- a/sugar/activity/activityhandle.py +++ b/sugar/activity/activityhandle.py @@ -15,7 +15,7 @@ # Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. -from sugar.presence import PresenceService +from sugar.presence import presenceservice class ActivityHandle(object): def __init__(self, activity_id): @@ -26,7 +26,7 @@ class ActivityHandle(object): def get_presence_service(self): if self.pservice_id: - pservice = PresenceService.get_instance() + pservice = presenceservice.get_instance() return pservice.get_activity(self.pservice_id) else: return None |