Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/sugar
diff options
context:
space:
mode:
authorTomeu Vizoso <tomeu@tomeuvizoso.net>2007-08-08 16:08:07 (GMT)
committer Tomeu Vizoso <tomeu@tomeuvizoso.net>2007-08-08 16:08:07 (GMT)
commitfa8bcd2ba58fca8605bc2fea72478a23f9bd9998 (patch)
tree5a1f5702a5847b8f7cb80684d0c2dd9f92e9f13d /sugar
parentbfcab6b0b64d1b10d4010c34596e748f54335ba9 (diff)
Move the activity register to the clipboard service.
Diffstat (limited to 'sugar')
-rw-r--r--sugar/activity/registry.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/sugar/activity/registry.py b/sugar/activity/registry.py
index b19abee..430a2df 100644
--- a/sugar/activity/registry.py
+++ b/sugar/activity/registry.py
@@ -1,4 +1,5 @@
# Copyright (C) 2006-2007 Red Hat, Inc.
+# Copyright (C) 2007 One Laptop Per Child
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@ -19,9 +20,9 @@ import logging
import dbus
-_SHELL_SERVICE = "org.laptop.Shell"
-_SHELL_PATH = "/org/laptop/Shell"
-_REGISTRY_IFACE = "org.laptop.Shell.ActivityRegistry"
+_ACTIVITY_REGISTRY_SERVICE_NAME = 'org.laptop.ActivityRegistry'
+_ACTIVITY_REGISTRY_IFACE = 'org.laptop.ActivityRegistry'
+_ACTIVITY_REGISTRY_PATH = '/org/laptop/ActivityRegistry'
def _activity_info_from_dict(info_dict):
if not info_dict:
@@ -39,8 +40,9 @@ class ActivityInfo(object):
class ActivityRegistry(object):
def __init__(self):
bus = dbus.SessionBus()
- bus_object = bus.get_object(_SHELL_SERVICE, _SHELL_PATH)
- self._registry = dbus.Interface(bus_object, _REGISTRY_IFACE)
+ bus_object = bus.get_object(_ACTIVITY_REGISTRY_SERVICE_NAME,
+ _ACTIVITY_REGISTRY_PATH)
+ self._registry = dbus.Interface(bus_object, _ACTIVITY_REGISTRY_IFACE)
self._registry.connect_to_signal('ActivityAdded', self._activity_added_cb)
# Two caches fo saving some travel across dbus.