Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--lib/sugar/activity/activityfactory.py8
2 files changed, 6 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 8c0052a..c391c95 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+* Fix typo in activity launching code. (marco)
+
Snapshot e23f012e08
* Launch a few activities outside rainbow containers. (marco)
diff --git a/lib/sugar/activity/activityfactory.py b/lib/sugar/activity/activityfactory.py
index 2319f9b..2858681 100644
--- a/lib/sugar/activity/activityfactory.py
+++ b/lib/sugar/activity/activityfactory.py
@@ -170,10 +170,10 @@ class ActivityCreationHandler(gobject.GObject):
self._handle = handle
self._use_rainbow = os.path.exists('/etc/olpc-security')
- if handle.activity_id in [ 'org.laptop.JournalActivity',
- 'org.laptop.Terminal',
- 'org.laptop.LogViewer',
- 'org.laptop.Analyze' ]:
+ if service_name in [ 'org.laptop.JournalActivity',
+ 'org.laptop.Terminal',
+ 'org.laptop.LogViewer',
+ 'org.laptop.Analyze' ]:
self._use_rainbow = False
bus = dbus.SessionBus()