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

Hookup the new invites implementation. Need to fix

Browse Source 
the frame view since that's bitrotten.
This commit is contained in:
Marco Pesenti Gritti 2007-08-31 12:43:10 +02:00
parent e5db6eb971
commit 0d4d74b94f
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
shell/model/Owner.py
View File

@ -66,6 +66,8 @@ class ShellOwner(gobject.GObject):
self._icon_hash = util.printable_hash(digest) self._icon_hash = util.printable_hash(digest)
self._pservice = presenceservice.get_instance() self._pservice = presenceservice.get_instance()
self._pservice.connect('activity-invitation',
self._activity_invitation_cb)
self._invites = Invites() self._invites = Invites()
@ -75,7 +77,6 @@ class ShellOwner(gobject.GObject):
def get_nick(self): def get_nick(self):
return self._nick return self._nick
def _handle_invite(self, issuer, bundle_id, activity_id): def _activity_invitation_cb(self, pservice, activity, buddy, message):
"""XMLRPC method, called when the owner is invited to an activity.""" self._invites.add_invite(buddy, activity.props.type,
self._invites.add_invite(issuer, bundle_id, activity_id) activity.props.id)
return ''

13
shell/view/ActivityHost.py
View File

@ -16,6 +16,9 @@
import gtk import gtk
import dbus import dbus
import logging
from sugar.presence import presenceservice
import OverlayWindow import OverlayWindow
@ -62,7 +65,15 @@ class ActivityHost:
return self._model return self._model
def invite(self, buddy): def invite(self, buddy):
pass pservice = presenceservice.get_instance()
activity = pservice.get_activity(self.get_id())
if activity is None:
logging.error('Invite failed, %s is unknown.' % self.get_id())
activity.invite(buddy.get_buddy(), '', self._invite_response_cb)
def _invite_response_cb(self, error):
if error:
logging.error('Invite failed: %s' % error)
def present(self): def present(self):
# wnck.Window.activate() expects a timestamp, but we don't # wnck.Window.activate() expects a timestamp, but we don't