Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Schampijer <simon@schampijer.de>2011-03-16 19:46:10 (GMT)
committer Simon Schampijer <simon@schampijer.de>2011-03-31 14:33:36 (GMT)
commit0efaeed0f6730694b8f31e296e412f4911f70db7 (patch)
treecb9726f474c34380761272802945d246eb54e647
parentbde490706a2c1ecdfe7c38aa3742b6fd378b80c6 (diff)
Remove leftovers that try to sync friends in the PS OLPC #10736
The shell should not update the PS anymore at all. A side effect of this fix is that this avoids breaking if sugar-presence-service doesn't start (e.g. because of OLPC #10739). Signed-off-by: Simon Schampijer <simon@laptop.org> Acked-By: Sascha Silbe <silbe@activitycentral.com>
-rw-r--r--src/jarabe/model/friends.py25
1 files changed, 0 insertions, 25 deletions
diff --git a/src/jarabe/model/friends.py b/src/jarabe/model/friends.py
index 192f683..f78d785 100644
--- a/src/jarabe/model/friends.py
+++ b/src/jarabe/model/friends.py
@@ -156,31 +156,6 @@ class Friends(gobject.GObject):
cp.write(fileobject)
fileobject.close()
- self._sync_friends()
-
- def _sync_friends(self):
- # XXX: temporary hack
- # remove this when the shell service has a D-Bus API for buddies
-
- def friends_synced():
- pass
-
- def friends_synced_error(e):
- logging.error('Error asking presence service to sync friends: %s',
- e)
-
- keys = []
- for friend in self:
- keys.append(friend.get_key())
-
- bus = dbus.SessionBus()
- ps = bus.get_object('org.laptop.Sugar.Presence',
- '/org/laptop/Sugar/Presence')
- psi = dbus.Interface(ps, 'org.laptop.Sugar.Presence')
- psi.SyncFriends(keys,
- reply_handler=friends_synced,
- error_handler=friends_synced_error)
-
def get_model():
global _model