Cut over to new PresenceService

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()

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

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