diff options
Diffstat (limited to 'src/jarabe/model/friends.py')
| -rw-r--r-- | src/jarabe/model/friends.py | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/jarabe/model/friends.py b/src/jarabe/model/friends.py index 98bff96..192f683 100644 --- a/src/jarabe/model/friends.py +++ b/src/jarabe/model/friends.py @@ -27,10 +27,14 @@ from sugar.graphics.xocolor import XoColor from jarabe.model.buddy import BuddyModel from jarabe.model import neighborhood + +_model = None + + class FriendBuddyModel(BuddyModel): __gtype_name__ = 'SugarFriendBuddyModel' - _NOT_PRESENT_COLOR = "#D5D5D5,#FFFFFF" + _NOT_PRESENT_COLOR = '#D5D5D5,#FFFFFF' def __init__(self, nick, key): self._online_buddy = None @@ -45,7 +49,7 @@ class FriendBuddyModel(BuddyModel): if buddy is not None: self._set_online_buddy(buddy) - def __buddy_added_cb(self, neighborhood, buddy): + def __buddy_added_cb(self, model_, buddy): if buddy.key != self.key: return self._set_online_buddy(buddy) @@ -56,7 +60,7 @@ class FriendBuddyModel(BuddyModel): self.notify('color') self.notify('present') - def __buddy_removed_cb(self, neighborhood, buddy): + def __buddy_removed_cb(self, model_, buddy): if buddy.key != self.key: return self._online_buddy = None @@ -87,12 +91,13 @@ class FriendBuddyModel(BuddyModel): handle = gobject.property(type=object, getter=get_handle) + class Friends(gobject.GObject): __gsignals__ = { - 'friend-added': (gobject.SIGNAL_RUN_FIRST, - gobject.TYPE_NONE, ([object])), - 'friend-removed': (gobject.SIGNAL_RUN_FIRST, - gobject.TYPE_NONE, ([str])) + 'friend-added': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, + ([object])), + 'friend-removed': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, + ([str])), } def __init__(self): @@ -104,7 +109,7 @@ class Friends(gobject.GObject): self.load() def has_buddy(self, buddy): - return self._friends.has_key(buddy.get_key()) + return buddy.get_key() in self._friends def add_friend(self, buddy_info): self._friends[buddy_info.get_key()] = buddy_info @@ -176,7 +181,6 @@ class Friends(gobject.GObject): reply_handler=friends_synced, error_handler=friends_synced_error) -_model = None def get_model(): global _model |