diff options
| -rw-r--r-- | shell/PresenceService/PresenceService.py | 4 | ||||
| -rw-r--r-- | shell/session/Session.py | 4 | ||||
| -rw-r--r-- | sugar/presence/PresenceService.py | 5 |
3 files changed, 12 insertions, 1 deletions
diff --git a/shell/PresenceService/PresenceService.py b/shell/PresenceService/PresenceService.py index 997340a..3f655b9 100644 --- a/shell/PresenceService/PresenceService.py +++ b/shell/PresenceService/PresenceService.py @@ -231,6 +231,9 @@ class PresenceServiceDBusHelper(dbus.service.Object): def unregisterServiceType(self, stype): self._parent.unregister_service_type(stype) + @dbus.service.method(_PRESENCE_DBUS_INTERFACE) + def start(self): + self._parent.start() class PresenceService(object): def __init__(self): @@ -262,6 +265,7 @@ class PresenceService(object): self._bus_name = dbus.service.BusName(_PRESENCE_SERVICE, bus=self._session_bus) self._dbus_helper = PresenceServiceDBusHelper(self, self._bus_name) + def start(self): # Connect to Avahi for mDNS stuff self._system_bus = dbus.SystemBus() self._mdns_service = dbus.Interface(self._system_bus.get_object(avahi.DBUS_NAME, diff --git a/shell/session/Session.py b/shell/session/Session.py index 66a085f..9815897 100644 --- a/shell/session/Session.py +++ b/shell/session/Session.py @@ -55,7 +55,9 @@ class Session: process.start() console = ConsoleWindow() - #sugar.logger.start('Shell', console) + sugar.logger.start('Shell', console) + + PresenceService.start() process = MatchboxProcess() process.start() diff --git a/sugar/presence/PresenceService.py b/sugar/presence/PresenceService.py index 20eafca..9fbbc0d 100644 --- a/sugar/presence/PresenceService.py +++ b/sugar/presence/PresenceService.py @@ -205,3 +205,8 @@ class PresenceService(gobject.GObject): def unregister_service_type(self, stype): self._ps.unregisterServiceType(stype) + +def start(): + bus = dbus.SessionBus() + ps = dbus.Interface(bus.get_object(DBUS_SERVICE, DBUS_PATH), DBUS_INTERFACE) + ps.start() |