Cut over to new PresenceService

8 files changed, 16 insertions, 17 deletions

diff --git a/shell/model/BuddyModel.py b/shell/model/BuddyModel.py
index 9f1ad7f..9894dde 100644
--- a/shell/model/BuddyModel.py
+++ b/shell/model/BuddyModel.py
@@ -14,7 +14,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-from sugar.presence import PresenceService
+from sugar.presence import presenceservice
 from sugar.graphics.xocolor import XoColor
 import gobject
 
@@ -44,7 +44,7 @@ class BuddyModel(gobject.GObject):
         self._bic_handler = None
         self._cac_handler = None
 
-        self._pservice = PresenceService.get_instance()
+        self._pservice = presenceservice.get_instance()
 
         self._buddy = None
 
diff --git a/shell/model/MeshModel.py b/shell/model/MeshModel.py
index db464f9..619a4f3 100644
--- a/shell/model/MeshModel.py
+++ b/shell/model/MeshModel.py
@@ -17,7 +17,7 @@
 import gobject
 
 from sugar.graphics.xocolor import XoColor
-from sugar.presence import PresenceService
+from sugar.presence import presenceservice
 from sugar.activity import bundleregistry
 from model.BuddyModel import BuddyModel
 from model.accesspointmodel import AccessPointModel
@@ -74,7 +74,7 @@ class MeshModel(gobject.GObject):
         self._mesh = None
         self._bundle_registry = bundleregistry.get_registry()
 
-        self._pservice = PresenceService.get_instance()
+        self._pservice = presenceservice.get_instance()
         self._pservice.connect("service-appeared",
                                self._service_appeared_cb)
         self._pservice.connect('activity-disappeared',
diff --git a/shell/model/Owner.py b/shell/model/Owner.py
index b0d020c..bbc3075 100644
--- a/shell/model/Owner.py
+++ b/shell/model/Owner.py
@@ -25,7 +25,7 @@ import dbus
 from sugar import env
 from sugar import profile
 from sugar.p2p import Stream
-from sugar.presence import PresenceService
+from sugar.presence import presenceservice
 from sugar import util
 from model.Invites import Invites
 
@@ -68,7 +68,7 @@ class ShellOwner(gobject.GObject):
         digest = md5.new(self._icon).digest()
         self._icon_hash = util.printable_hash(digest)
 
-        self._pservice = PresenceService.get_instance()
+        self._pservice = presenceservice.get_instance()
 
         self._invites = Invites()
 
diff --git a/shell/model/ShellModel.py b/shell/model/ShellModel.py
index 4c0df12..a1cf328 100644
--- a/shell/model/ShellModel.py
+++ b/shell/model/ShellModel.py
@@ -18,7 +18,7 @@ import os
 
 import gobject
 
-from sugar.presence import PresenceService
+from sugar.presence import presenceservice
 from sugar.activity.bundleregistry import BundleRegistry
 from model.Friends import Friends
 from model.MeshModel import MeshModel
@@ -44,8 +44,7 @@ class ShellModel(gobject.GObject):
         self._current_activity = None
         self._state = self.STATE_RUNNING
 
-        PresenceService.start()
-        self._pservice = PresenceService.get_instance()
+        self._pservice = presenceservice.get_instance()
 
         self._owner = ShellOwner()
         self._owner.announce()
diff --git a/shell/model/homeactivity.py b/shell/model/homeactivity.py
index 8772888..9570c1b 100644
--- a/shell/model/homeactivity.py
+++ b/shell/model/homeactivity.py
@@ -21,7 +21,7 @@ import gobject
 import dbus
 
 from sugar.graphics.xocolor import XoColor
-from sugar.presence import PresenceService
+from sugar.presence import presenceservice
 from sugar import profile
 
 class HomeActivity(gobject.GObject):
@@ -89,7 +89,7 @@ class HomeActivity(gobject.GObject):
         return self._bundle.get_icon()
     
     def get_icon_color(self):
-        pservice = PresenceService.get_instance()
+        pservice = presenceservice.get_instance()
         activity = pservice.get_activity(self._activity_id)
         if activity != None:
             return XoColor(activity.get_color())
diff --git a/shell/view/BuddyMenu.py b/shell/view/BuddyMenu.py
index a8224bb..7756221 100644
--- a/shell/view/BuddyMenu.py
+++ b/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):
diff --git a/shell/view/frame/FriendsBox.py b/shell/view/frame/FriendsBox.py
index eab55fc..4f4394b 100644
--- a/shell/view/frame/FriendsBox.py
+++ b/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)
 
diff --git a/shell/view/home/FriendView.py b/shell/view/home/FriendView.py
index d0273a7..06873b4 100644
--- a/shell/view/home/FriendView.py
+++ b/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)