Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/sugar/activity/ActivityFactory.py
diff options
context:
space:
mode:
Diffstat (limited to 'sugar/activity/ActivityFactory.py')
-rw-r--r--sugar/activity/ActivityFactory.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/sugar/activity/ActivityFactory.py b/sugar/activity/ActivityFactory.py
index 94e765e..8ecb4c8 100644
--- a/sugar/activity/ActivityFactory.py
+++ b/sugar/activity/ActivityFactory.py
@@ -25,10 +25,13 @@ import gobject
import gtk
from sugar.presence.PresenceService import PresenceService
-from sugar.activity import Activity
from sugar.activity.bundle import Bundle
from sugar import logger
+_ACTIVITY_SERVICE_NAME = "org.laptop.Activity"
+_ACTIVITY_SERVICE_PATH = "/org/laptop/Activity"
+_ACTIVITY_INTERFACE = "org.laptop.Activity"
+
def get_path(activity_name):
"""Returns the activity path"""
return '/' + activity_name.replace('.', '/')
@@ -101,9 +104,9 @@ class ActivityCreationHandler(gobject.GObject):
def _reply_handler(self, xid):
bus = dbus.SessionBus()
- proxy_obj = bus.get_object(Activity.get_service_name(xid),
- Activity.get_object_path(xid))
- activity = dbus.Interface(proxy_obj, Activity.ACTIVITY_INTERFACE)
+ proxy_obj = bus.get_object(_ACTIVITY_SERVICE_NAME + '%d' % xid,
+ _ACTIVITY_SERVICE_PATH + "/%s" % xid)
+ activity = dbus.Interface(proxy_obj, _ACTIVITY_INTERFACE)
self.emit('success', activity)
def _error_handler(self, err):