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

Monitor buddy property change signals on creation; misc cleanups

Browse Source
This commit is contained in:
Dan Williams 2006-09-22 15:49:16 -04:00
parent fcef47181b
commit 2f7b3abef7
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
shell/model/BuddyModel.py
View File

@ -3,13 +3,19 @@ from sugar.canvas.IconColor import IconColor
class BuddyModel: class BuddyModel:
def __init__(self, buddy=None): def __init__(self, buddy=None):
if buddy:
self.set_name(buddy.get_name())
self.set_color(buddy.get_color())
self._buddy = buddy
self._cur_activity = None self._cur_activity = None
self._pservice = PresenceService.get_instance() self._pservice = PresenceService.get_instance()
self._pservice.connect('buddy-appeared', self.__buddy_appeared_cb)
self._buddy = buddy
if self._buddy:
self.set_name(self._buddy.get_name())
self.set_color(self._buddy.get_color())
self._buddy.connect('property-changed',
self.__buddy_property_changed_cb)
else:
# if we don't have a buddy yet, connect to the PS
# and wait until the buddy pops up on the network
self._pservice.connect('buddy-appeared', self.__buddy_appeared_cb)
def set_name(self, name): def set_name(self, name):
self._name = name self._name = name
@ -24,18 +30,24 @@ class BuddyModel:
return self._color return self._color
def get_buddy(self): def get_buddy(self):
if not self._buddy: # If we have a buddy already, just return
self._buddy = self._pservice.get_buddy_by_name(self._name) if self._buddy:
if self._buddy: return self._buddy
self._buddy.connect('property-changed',
self.__buddy_property_changed_cb) # Otherwise try to get the buddy from the PS
self._buddy = self._pservice.get_buddy_by_name(self._name)
if self._buddy:
self._buddy.connect('property-changed',
self.__buddy_property_changed_cb)
return self._buddy return self._buddy
def __buddy_appeared_cb(self, pservice, buddy): def __buddy_appeared_cb(self, pservice, buddy):
# FIXME: use public key rather than buddy name
if not self._buddy and buddy.get_name() == self._name: if not self._buddy and buddy.get_name() == self._name:
self.get_buddy() self.get_buddy()
def __buddy_property_changed_cb(self, buddy, keys): def __buddy_property_changed_cb(self, buddy, keys):
# all we care about right now is current activity
curact = self._buddy.get_current_activity() curact = self._buddy.get_current_activity()
self._cur_activity = self._pservice.get_activity(curact) self._cur_activity = self._pservice.get_activity(curact)