Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomeu Vizoso <tomeu.vizoso@collabora.co.uk>2010-08-24 08:03:34 (GMT)
committer Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>2010-08-24 08:04:11 (GMT)
commitd8631528f072ef0aa0a6a192e9c3ccde8f9cf21b (patch)
tree9d074123aa2912a3779a71a1d78e1b20d5e9ad53
parentef3a35b7595c543f6d8b6a54e60e6c21e2a37f8f (diff)
Correctly retrieve the OwnerBuddyModel instance
-rw-r--r--src/jarabe/desktop/favoritesview.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py
index bb85024..ac847e2 100644
--- a/src/jarabe/desktop/favoritesview.py
+++ b/src/jarabe/desktop/favoritesview.py
@@ -31,7 +31,6 @@ from sugar.graphics.alert import Alert
from sugar.graphics.xocolor import XoColor
from sugar.activity import activityfactory
from sugar.activity.activityhandle import ActivityHandle
-from sugar.presence import presenceservice
from sugar import dispatch
from sugar.datastore import datastore
@@ -40,7 +39,7 @@ from jarabe.view.palettes import CurrentActivityPalette, ActivityPalette
from jarabe.view.buddyicon import BuddyIcon
from jarabe.view.buddymenu import BuddyMenu
from jarabe.view import launcher
-from jarabe.model.buddy import BuddyModel, get_owner_instance
+from jarabe.model.buddy import get_owner_instance
from jarabe.model import shell
from jarabe.model import bundleregistry
from jarabe.journal import misc
@@ -611,8 +610,7 @@ class OwnerIcon(BuddyIcon):
self._palette_enabled = True
return
- presence_service = presenceservice.get_instance()
- palette = BuddyMenu(self.buddy)
+ palette = BuddyMenu(get_owner_instance())
client = gconf.client_get_default()
backup_url = client.get_string('/desktop/sugar/backup_url')