Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/shell/Shell.py
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@localhost.localdomain>2006-07-19 15:42:34 (GMT)
committer Marco Pesenti Gritti <marco@localhost.localdomain>2006-07-19 15:42:34 (GMT)
commitc2f9d4c2067db08b4ca3c02a76797ae72faa5e6a (patch)
tree6d57535c9aabc6b2f730fcd5ec68b0a3c456e696 /shell/Shell.py
parentae00121fbffdb3434d79716a112bd5956b9e5e67 (diff)
parentdb04a3d2c9633df327707d869c5814fa2c35513f (diff)
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Diffstat (limited to 'shell/Shell.py')
-rwxr-xr-xshell/Shell.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/shell/Shell.py b/shell/Shell.py
index b0e04d6..416e655 100755
--- a/shell/Shell.py
+++ b/shell/Shell.py
@@ -14,6 +14,7 @@ from sugar import env
from sugar.activity import Activity
from PeopleWindow import PeopleWindow
from Owner import ShellOwner
+from PresenceService import PresenceService
class ShellDbusService(dbus.service.Object):
def __init__(self, shell, bus_name):
@@ -46,6 +47,7 @@ class Shell:
bus_name = dbus.service.BusName('com.redhat.Sugar.Shell', bus=session_bus)
ShellDbusService(self, bus_name)
+ self._ps = PresenceService.PresenceService()
self._owner = ShellOwner()
self._registry = ActivityRegistry()