Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

sugar/activity/activityfactory.py

@@ -122,7 +122,8 @@ class ActivityCreationHandler(gobject.GObject):
                     error_handler=self._notify_launch_error_handler)
 
         if not os.path.exists('/etc/olpc-security'):
-            self._factory.create(self._activity_handle.get_dict(),
+            handle = self._activity_handle.get_dict() 
+            self._factory.create(dbus.Dictionary(handle, signature='ss'),
                                  timeout=120 * 1000,
                                  reply_handler=self._no_reply_handler,
                                  error_handler=self._create_error_handler)

sugar/activity/activityhandle.py

@@ -67,15 +67,13 @@ class ActivityHandle(object):
 
     def get_dict(self):
         """Retrieve our settings as a dictionary"""
-        result = { }
-        if self.activity_id:
-            result['activity_id'] = str(self.activity_id)
+        result = { 'activity_id' : self.activity_id }
         if self.pservice_id:
-            result['pservice_id'] = str(self.pservice_id)
+            result['pservice_id'] = self.pservice_id
         if self.object_id:
-            result['object_id'] = str(self.object_id)
+            result['object_id'] = self.object_id
         if self.uri:
-            result['uri'] = str(self.uri)
+            result['uri'] = self.uri
 
         return result