diff options
author | Marco Pesenti Gritti <mpg@redhat.com> | 2007-08-27 16:25:45 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <mpg@redhat.com> | 2007-08-27 16:25:45 (GMT) |
commit | 294a5231b9a4b67220a38cacd0998e3a40ebd47b (patch) | |
tree | 20f0e312c123751994991f46765539b0d033e6b6 /sugar/activity | |
parent | 40ddf944572d594ec42a3d935ca1dd8040a30718 (diff) |
2647, if security is enabled let rainbow launch activities.
Also notify rainbow when active activity changes.
Patch by Ashsong, had to merge it manually.
Diffstat (limited to 'sugar/activity')
-rw-r--r-- | sugar/activity/activityfactory.py | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/sugar/activity/activityfactory.py b/sugar/activity/activityfactory.py index 404e5f4..d7d6d92 100644 --- a/sugar/activity/activityfactory.py +++ b/sugar/activity/activityfactory.py @@ -26,12 +26,18 @@ from sugar.presence import presenceservice from sugar.activity.activityhandle import ActivityHandle from sugar import util +import os + _SHELL_SERVICE = "org.laptop.Shell" _SHELL_PATH = "/org/laptop/Shell" _SHELL_IFACE = "org.laptop.Shell" _ACTIVITY_FACTORY_INTERFACE = "org.laptop.ActivityFactory" +_RAINBOW_SERVICE_NAME = "org.laptop.security.Rainbow" +_RAINBOW_ACTIVITY_FACTORY_PATH = "/" +_RAINBOW_ACTIVITY_FACTORY_INTERFACE = "org.laptop.security.Rainbow" + def create_activity_id(): """Generate a new, unique ID for this activity""" pservice = presenceservice.get_instance() @@ -84,6 +90,9 @@ class ActivityCreationHandler(gobject.GObject): particular type of activity is created during the activity registration process in shell bundle registry which creates service definition files for each registered bundle type. + + If the file '/etc/olpc-security' exists, then activity launching + will be delegated to the prototype 'Rainbow' security service. """ gobject.GObject.__init__(self) self._service_name = service_name @@ -112,10 +121,22 @@ class ActivityCreationHandler(gobject.GObject): reply_handler=self._no_reply_handler, error_handler=self._notify_launch_error_handler) - self._factory.create(self._activity_handle.get_dict(), - timeout=120 * 1000, - reply_handler=self._no_reply_handler, - error_handler=self._create_error_handler) + if not os.path.exists('/etc/olpc-security'): + self._factory.create(self._activity_handle.get_dict(), + timeout=120 * 1000, + reply_handler=self._no_reply_handler, + error_handler=self._create_error_handler) + else: + system_bus = dbus.SystemBus() + factory = system_bus.get_object(_RAINBOW_SERVICE_NAME, + _RAINBOW_ACTIVITY_FACTORY_PATH) + factory.CreateActivity( + self._service_name, + self._activity_handle.get_dict(), + timeout=120 * 1000, + reply_handler=self._create_reply_handler, + error_handler=self._create_error_handler, + dbus_interface=_RAINBOW_ACTIVITY_FACTORY_INTERFACE) def get_activity_id(self): """Retrieve the unique identity for this activity""" |