diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-09-26 20:12:18 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2006-09-26 20:12:18 (GMT) |
| commit | 72d43fde28c19adf61f37c38d4168c02efed0582 (patch) | |
| tree | d21aa786910112adc8cf1e7929454b3143e13f7a | |
| parent | 5d78b148ffe14e1653882bb352afdc8384d8c8e2 (diff) | |
Add a start method to the activity module, for initialization.
| -rw-r--r-- | activities/browser/BrowserActivity.py | 10 | ||||
| -rw-r--r-- | sugar/activity/ActivityFactory.py | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/activities/browser/BrowserActivity.py b/activities/browser/BrowserActivity.py index 7c2c5c6..8a315b4 100644 --- a/activities/browser/BrowserActivity.py +++ b/activities/browser/BrowserActivity.py @@ -17,11 +17,6 @@ class BrowserActivity(Activity): def __init__(self): Activity.__init__(self) - gtkmozembed.push_startup() - gtkmozembed.set_profile_path(env.get_profile_path(), 'gecko') - - gecko.startup() - self._share_service = None self._model_service = None self._notif_service = None @@ -132,3 +127,8 @@ class BrowserActivity(Activity): def _destroy_cb(self, window): if self._model: self._model.shutdown() + +def start(): + gtkmozembed.set_profile_path(env.get_profile_path(), 'gecko') + gtkmozembed.push_startup() + gecko.startup() diff --git a/sugar/activity/ActivityFactory.py b/sugar/activity/ActivityFactory.py index e7a991b..bd2364e 100644 --- a/sugar/activity/ActivityFactory.py +++ b/sugar/activity/ActivityFactory.py @@ -29,7 +29,9 @@ class ActivityFactory(dbus.service.Object): module = __import__(module_name) for comp in module_name.split('.')[1:]: module = getattr(module, comp) - + if hasattr(module, 'start'): + module.start() + self._class = getattr(module, class_name) bus = dbus.SessionBus() |