Cut over to new PresenceService

shell/view/BuddyMenu.py

@@ -22,7 +22,7 @@ import hippo
 from sugar.graphics.menu import Menu, MenuItem
 from sugar.graphics.canvasicon import CanvasIcon
 from sugar.graphics import units
-from sugar.presence import PresenceService
+from sugar.presence import presenceservice
 
 class BuddyMenu(Menu):
     ACTION_MAKE_FRIEND = 0
@@ -80,7 +80,7 @@ class BuddyMenu(Menu):
 
     def _add_items(self):
         shell_model = self._shell.get_model()
-        pservice = PresenceService.get_instance()
+        pservice = presenceservice.get_instance()
 
         friends = shell_model.get_friends()
         if friends.has_buddy(self._buddy):

shell/view/frame/FriendsBox.py

@@ -18,7 +18,7 @@ import hippo
 
 from sugar.graphics.canvasicon import CanvasIcon
 from sugar.graphics import color
-from sugar.presence import PresenceService
+from sugar.presence import presenceservice
 from view.BuddyIcon import BuddyIcon
 from model.BuddyModel import BuddyModel
 
@@ -46,7 +46,7 @@ class FriendsBox(hippo.CanvasBox):
         self._left_hid = -1
         self._buddies = {}
 
-        self._pservice = PresenceService.get_instance()
+        self._pservice = presenceservice.get_instance()
         self._pservice.connect('activity-appeared',
                                self.__activity_appeared_cb)
 

shell/view/home/FriendView.py

@@ -20,13 +20,13 @@ import gobject
 from view.BuddyIcon import BuddyIcon
 from sugar.graphics.canvasicon import CanvasIcon
 from sugar.graphics import units
-from sugar.presence import PresenceService
+from sugar.presence import presenceservice
 
 class FriendView(hippo.CanvasBox):
     def __init__(self, shell, menu_shell, buddy, **kwargs):
         hippo.CanvasBox.__init__(self, **kwargs)
 
-        self._pservice = PresenceService.get_instance()
+        self._pservice = presenceservice.get_instance()
 
         self._buddy = buddy
         self._buddy_icon = BuddyIcon(shell, menu_shell, buddy)