From e79a5f5e989fa062366295c3f236692fc3c889e5 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Fri, 15 Sep 2006 16:19:56 +0200 Subject: [PATCH] Really fix invites --- shell/model/Owner.py | 8 ++++---- shell/model/ShellModel.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/shell/model/Owner.py b/shell/model/Owner.py index 5443eb97..1a6e3e85 100644 --- a/shell/model/Owner.py +++ b/shell/model/Owner.py @@ -6,7 +6,7 @@ import conf from sugar import env from sugar.p2p import Stream from sugar.presence import PresenceService -from model.Friends import Friends +from model.Invites import Invites PRESENCE_SERVICE_TYPE = "_presence_olpc._tcp" @@ -31,10 +31,10 @@ class ShellOwner(object): self._pservice = PresenceService.get_instance() - self._friends = Friends() + self._invites = Invites() - def get_friends(self): - return self._friends + def get_invites(self): + return self._invites def announce(self): # Create and announce our presence diff --git a/shell/model/ShellModel.py b/shell/model/ShellModel.py index 2bdf08ab..a20ac98d 100644 --- a/shell/model/ShellModel.py +++ b/shell/model/ShellModel.py @@ -1,7 +1,7 @@ import gobject from sugar.presence import PresenceService -from model.Invites import Invites +from model.Friends import Friends from model.Owner import ShellOwner class ShellModel(gobject.GObject): @@ -25,13 +25,13 @@ class ShellModel(gobject.GObject): self._owner = ShellOwner() self._owner.announce() - self._invites = Invites() + self._friends = Friends() def get_friends(self): - return self._owner.get_friends() + return self._friends def get_invites(self): - return self._invites + return self._owner.get_invites() def get_owner(self): return self._owner