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

Patch from smcv:

Browse Source 
sugar.presence.presenceservice: use #4660 fix in Presence Service to
streamline share process slightly (saves one D-Bus round trip)
This commit is contained in:
Marco Pesenti Gritti 2007-11-20 23:22:49 +01:00
parent d03eb3216f
commit f27317e0fc
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -1,4 +1,4 @@
0.70.2 * #4660: Use improved PS API which streamlines ShareActivity process (smcv)
0.70.1 0.70.1

16
lib/sugar/presence/presenceservice.py
View File

@ -424,9 +424,10 @@ class PresenceService(gobject.GObject):
raise RuntimeError("Could not get owner object from presence service.") raise RuntimeError("Could not get owner object from presence service.")
return self._new_object(owner_op) return self._new_object(owner_op)
def _share_activity_cb(self, activity, psact): def _share_activity_cb(self, activity, op):
"""Finish sharing the activity """Finish sharing the activity
""" """
psact = self._new_object(op)
psact._joined = True psact._joined = True
_logger.debug('%r: Just shared, setting up tubes', activity) _logger.debug('%r: Just shared, setting up tubes', activity)
psact.set_up_tubes(reply_handler=lambda: psact.set_up_tubes(reply_handler=lambda:
@ -434,16 +435,6 @@ class PresenceService(gobject.GObject):
error_handler=lambda e: error_handler=lambda e:
self._share_activity_error_cb(activity, e)) self._share_activity_error_cb(activity, e))
def _share_activity_privacy_cb(self, activity, private, op):
psact = self._new_object(op)
_logger.debug('%r: Just shared, setting privacy to %r', activity,
private)
psact.set_private(private,
reply_handler=lambda:
self._share_activity_cb(activity, psact),
error_handler=lambda e:
self._share_activity_error_cb(activity, e))
def _share_activity_error_cb(self, activity, err): def _share_activity_error_cb(self, activity, err):
"""Notify with GObject event of unsuccessful sharing of activity""" """Notify with GObject event of unsuccessful sharing of activity"""
_logger.debug("Error sharing activity %s: %s" % (activity.get_id(), err)) _logger.debug("Error sharing activity %s: %s" % (activity.get_id(), err))
@ -474,9 +465,10 @@ class PresenceService(gobject.GObject):
atype = activity.get_bundle_id() atype = activity.get_bundle_id()
name = activity.props.title name = activity.props.title
properties['private'] = bool(private)
self._ps.ShareActivity(actid, atype, name, properties, self._ps.ShareActivity(actid, atype, name, properties,
reply_handler=lambda op: \ reply_handler=lambda op: \
self._share_activity_privacy_cb(activity, private, op), self._share_activity_cb(activity, op),
error_handler=lambda e: \ error_handler=lambda e: \
self._share_activity_error_cb(activity, e)) self._share_activity_error_cb(activity, e))