Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/shell/model
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@localhost.localdomain>2006-09-15 14:19:56 (GMT)
committer Marco Pesenti Gritti <marco@localhost.localdomain>2006-09-15 14:19:56 (GMT)
commite79a5f5e989fa062366295c3f236692fc3c889e5 (patch)
treedc64bfbe01438143229a6253d2b3e78897eaf0d2 /shell/model
parentfe64b7c6d4d2351652cb311849b37fe95888834d (diff)
Really fix invites
Diffstat (limited to 'shell/model')
-rw-r--r--shell/model/Owner.py8
-rw-r--r--shell/model/ShellModel.py8
2 files changed, 8 insertions, 8 deletions
diff --git a/shell/model/Owner.py b/shell/model/Owner.py
index 5443eb9..1a6e3e8 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 2bdf08a..a20ac98 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