diff options
author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2007-04-26 22:55:23 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2007-04-26 22:55:23 (GMT) |
commit | c256958a9a08429a37170c1cab639fb6ac5a9f4f (patch) | |
tree | 9ddcc38f5de95e3580a2a391a8e3bd664477fe41 /sugar/activity | |
parent | 6cc3e7acdbf1d91d87d4dddab5a35dd14cdfabc0 (diff) |
Ensure the window is realized before getting his xid
Diffstat (limited to 'sugar/activity')
-rw-r--r-- | sugar/activity/activity.py | 8 | ||||
-rw-r--r-- | sugar/activity/activityservice.py | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/sugar/activity/activity.py b/sugar/activity/activity.py index f71cfdf..253d94e 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 e5b8956..04629ba 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 |