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-11 18:00:07 (GMT)
committer Tomeu Vizoso <tomeu.vizoso@collabora.co.uk>2010-08-20 13:02:28 (GMT)
commit73007f5a45c39bcbccc594cd4cb4aa5d9e846a50 (patch)
tree64cca21f50ea929cb10222ff0b54a58830b1b687
parentd4c93ab9f9123e67cf5b838b85cd3c588195352a (diff)
Check the known shared activities when looking for the color
-rw-r--r--src/jarabe/model/shell.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/jarabe/model/shell.py b/src/jarabe/model/shell.py
index 6d6cbde..f93b7e5 100644
--- a/src/jarabe/model/shell.py
+++ b/src/jarabe/model/shell.py
@@ -30,6 +30,7 @@ from sugar.graphics.xocolor import XoColor
from sugar.presence import presenceservice
from jarabe.model.bundleregistry import get_registry
+from jarabe.model import neighborhood
_SERVICE_NAME = "org.laptop.Activity"
_SERVICE_PATH = "/org/laptop/Activity"
@@ -147,14 +148,13 @@ class Activity(gobject.GObject):
"""
pservice = presenceservice.get_instance()
- logging.info('KILL_PS check in local list of activities')
# HACK to suppress warning in logs when activity isn't found
# (if it's locally launched and not shared yet)
activity = None
- #for act in pservice.get_activities():
- # if self._activity_id == act.props.id:
- # activity = act
- # break
+ for act in neighborhood.get_model().get_activities():
+ if self._activity_id == act.activity_id:
+ activity = act
+ break
if activity != None:
return XoColor(activity.props.color)