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

sugar.presence.presenceservice: Don't call now-nonexistent method InviteActivity - instead, use the new property-setting API to set the 'private' property suitably

Browse Source
This commit is contained in:
Simon McVittie 2007-08-30 12:17:33 +01:00
parent 55759d5608
commit 5bfd70baca
1 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
sugar/presence/presenceservice.py
View File

@ -420,16 +420,22 @@ 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, op): def _share_activity_cb(self, activity, psact):
"""Notify with GObject event of successful sharing of activity """Notify with GObject event of successful sharing of activity
op -- full dbus path of the new object, must be
prefixed with either of _PS_BUDDY_OP or _PS_ACTIVITY_OP
""" """
psact = self._new_object(op)
psact._joined = True psact._joined = True
self.emit("activity-shared", True, psact, None) self.emit("activity-shared", True, psact, None)
def _share_activity_privacy_cb(self, activity, private, op):
psact = self._new_object(op)
# FIXME: this should be done asynchronously (more API needed)
try:
psact.props.private = private
except Exception, e:
self._share_activity_error_cb(activity, e)
else:
self._share_activity_cb(activity, psact)
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))
@ -449,7 +455,6 @@ class PresenceService(gobject.GObject):
returns None returns None
""" """
actid = activity.get_id() actid = activity.get_id()
_logger.debug('XXXX in share_activity')
# Ensure the activity is not already shared/joined # Ensure the activity is not already shared/joined
for obj in self._objcache.values(): for obj in self._objcache.values():
@ -461,21 +466,11 @@ class PresenceService(gobject.GObject):
atype = activity.get_service_name() atype = activity.get_service_name()
name = activity.props.title name = activity.props.title
if private: self._ps.ShareActivity(actid, atype, name, properties,
_logger.debug('XXXX private, so calling InviteActivity') reply_handler=lambda op: \
self._ps.InviteActivity(actid, atype, name, properties, self._share_activity_privacy_cb(activity, private, op),
reply_handler=lambda *args: \ error_handler=lambda e: \
self._share_activity_cb(activity, *args), self._share_activity_error_cb(activity, e))
error_handler=lambda *args: \
self._share_activity_error_cb(activity, *args))
else:
# FIXME: Test, then make this AdvertiseActivity:
_logger.debug('XXXX not private, so calling ShareActivity')
self._ps.ShareActivity(actid, atype, name, properties,
reply_handler=lambda *args: \
self._share_activity_cb(activity, *args),
error_handler=lambda *args: \
self._share_activity_error_cb(activity, *args))
def get_preferred_connection(self): def get_preferred_connection(self):
"""Gets the preferred telepathy connection object that an activity """Gets the preferred telepathy connection object that an activity