diff options
author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-09-15 14:04:30 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-09-15 14:04:30 (GMT) |
commit | fe64b7c6d4d2351652cb311849b37fe95888834d (patch) | |
tree | 1a4fc969b3f0f3c500d1e047e841c4c39cd00e4b /shell/model | |
parent | 7fb01c51e3dff5eb49ade044f15de30778355854 (diff) |
Fix invites
Diffstat (limited to 'shell/model')
-rw-r--r-- | shell/model/Owner.py | 6 | ||||
-rw-r--r-- | shell/model/ShellModel.py | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/shell/model/Owner.py b/shell/model/Owner.py index 7dec04a..5443eb9 100644 --- a/shell/model/Owner.py +++ b/shell/model/Owner.py @@ -6,6 +6,7 @@ import conf from sugar import env from sugar.p2p import Stream from sugar.presence import PresenceService +from model.Friends import Friends PRESENCE_SERVICE_TYPE = "_presence_olpc._tcp" @@ -30,6 +31,11 @@ class ShellOwner(object): self._pservice = PresenceService.get_instance() + self._friends = Friends() + + def get_friends(self): + return self._friends + def announce(self): # Create and announce our presence color = conf.get_profile().get_color() diff --git a/shell/model/ShellModel.py b/shell/model/ShellModel.py index 4929fe7..2bdf08a 100644 --- a/shell/model/ShellModel.py +++ b/shell/model/ShellModel.py @@ -1,7 +1,6 @@ import gobject from sugar.presence import PresenceService -from model.Friends import Friends from model.Invites import Invites from model.Owner import ShellOwner @@ -26,11 +25,10 @@ class ShellModel(gobject.GObject): self._owner = ShellOwner() self._owner.announce() - self._friends = Friends() self._invites = Invites() def get_friends(self): - return self._friends + return self._owner.get_friends() def get_invites(self): return self._invites |