sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve handle marshalling. Add an uri to the handle.

Browse Source
This commit is contained in:
Marco Pesenti Gritti 2007-02-22 00:41:26 +01:00
parent 0556d5f51f
commit 0d7bdeb20a
3 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sugar/activity/activityfactory.py
View File

@ -60,7 +60,7 @@ class ActivityCreationHandler(gobject.GObject):
proxy_obj = bus.get_object(service_name, bundle.get_object_path()) proxy_obj = bus.get_object(service_name, bundle.get_object_path())
factory = dbus.Interface(proxy_obj, "com.redhat.Sugar.ActivityFactory") factory = dbus.Interface(proxy_obj, "com.redhat.Sugar.ActivityFactory")
factory.create(str(self._activity_handle), factory.create(self._activity_handle.get_dict(),
reply_handler=self._reply_handler, reply_handler=self._reply_handler,
error_handler=self._error_handler) error_handler=self._error_handler)

4
sugar/activity/activityfactoryservice.py
View File

@ -48,9 +48,9 @@ class ActivityFactoryService(dbus.service.Object):
object_path = '/' + service_name.replace('.', '/') object_path = '/' + service_name.replace('.', '/')
dbus.service.Object.__init__(self, bus_name, object_path) dbus.service.Object.__init__(self, bus_name, object_path)
@dbus.service.method("com.redhat.Sugar.ActivityFactory") @dbus.service.method("com.redhat.Sugar.ActivityFactory", in_signature="a{ss}")
def create(self, handle): def create(self, handle):
activity_handle = activityhandle.create_from_string(handle) activity_handle = activityhandle.create_from_dict(handle)
activity = self._constructor(activity_handle) activity = self._constructor(activity_handle)
self._activities.append(activity) self._activities.append(activity)

31
sugar/activity/activityhandle.py
View File

@ -21,14 +21,29 @@ class ActivityHandle(object):
def __init__(self, activity_id): def __init__(self, activity_id):
self.activity_id = activity_id self.activity_id = activity_id
self.pservice_id = None self.pservice_id = None
self.uri = None
def __str__(self): def get_presence_service(self):
return self.activity_id if self.pservice_id:
def get_presence_service():
pservice = PresenceService.get_instance() pservice = PresenceService.get_instance()
return pservice.get_activity(self._pservice_id) return pservice.get_activity(self.pservice_id)
else:
return None
def create_from_string(handle): def get_dict(self):
activity_handle = ActivityHandle(handle) result = { 'activity_id' : self.activity_id }
activity_handle.pservice_id = handle if self.pservice_id:
result['pservice_id'] = self.pservice_id
if self.uri:
result['uri'] = self.uri
return result
def create_from_dict(handle_dict):
result = ActivityHandle(handle_dict['activity_id'])
if handle_dict.has_key('pservice_id'):
result.pservice_id = handle_dict['pservice_id']
if handle_dict.has_key('uri'):
result.uri = handle_dict['uri']
return result