diff --git a/sugar/activity/activity.py b/sugar/activity/activity.py index f71cfdfc..253d94e0 100644 --- a/sugar/activity/activity.py +++ b/sugar/activity/activity.py @@ -24,11 +24,11 @@ import logging import os import gtk -import hippo from sugar.presence import presenceservice from sugar.activity.activityservice import ActivityService from sugar.graphics.window import Window +from sugar.graphics.toolbox import ActivityToolbar class Activity(Window, gtk.Container): """Base Activity class that all other Activities derive from.""" @@ -74,12 +74,6 @@ class Activity(Window, gtk.Container): self.toolbox.add_toolbar('Activity', activity_toolbar) activity_toolbar.show() - # DEPRECATED It will be removed after 3-6-2007 stable image - def do_add(self, widget): - if self.child: - self.remove(self.child) - gtk.Window.do_add(self, widget) - def get_service_name(self): """Gets the activity service name.""" return os.environ['SUGAR_BUNDLE_SERVICE_NAME'] diff --git a/sugar/activity/activityservice.py b/sugar/activity/activityservice.py index e5b89567..04629ba4 100644 --- a/sugar/activity/activityservice.py +++ b/sugar/activity/activityservice.py @@ -44,6 +44,8 @@ class ActivityService(dbus.service.Object): The various methods exposed on dbus are just forwarded to the client Activity object's equally-named methods. """ + activity.realize() + xid = activity.window.xid service_name = _ACTIVITY_SERVICE_NAME + '%d' % xid object_path = _ACTIVITY_SERVICE_PATH + "/%s" % xid