diff options
author | Marco Pesenti Gritti <mpg@redhat.com> | 2007-02-22 14:55:07 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <mpg@redhat.com> | 2007-02-22 14:55:07 (GMT) |
commit | c4435397fc2367743acf980b3c978614b59bb28f (patch) | |
tree | 28fcb4e591c82c240084576c3cb08d3f87a79c98 /sugar/activity | |
parent | 02f375b7108037b6a1dc2f002f03091aa4853b8a (diff) |
Remove bundle specific stuff from env.
Move get_bundle_path to activity.
Diffstat (limited to 'sugar/activity')
-rw-r--r-- | sugar/activity/activity.py | 12 | ||||
-rw-r--r-- | sugar/activity/activityservice.py | 6 |
2 files changed, 10 insertions, 8 deletions
diff --git a/sugar/activity/activity.py b/sugar/activity/activity.py index c706b7a..3c6f64a 100644 --- a/sugar/activity/activity.py +++ b/sugar/activity/activity.py @@ -21,7 +21,6 @@ import gtk from sugar.presence import PresenceService from sugar.activity.activityservice import ActivityService -from sugar import env class Activity(gtk.Window): """Base Activity class that all other Activities derive from.""" @@ -49,13 +48,13 @@ class Activity(gtk.Window): self.present() - def get_type(self): - """Gets the activity type.""" - return env.get_bundle_service_name() + def get_service_name(self): + """Gets the activity service name.""" + return os.environ['SUGAR_BUNDLE_SERVICE_NAME'] def get_default_type(self): """Gets the type of the default activity network service""" - return env.get_bundle_default_type() + return os.environ['SUGAR_BUNDLE_DEFAULT_TYPE'] def get_shared(self): """Returns TRUE if the activity is shared on the mesh.""" @@ -103,3 +102,6 @@ class Activity(gtk.Window): self._bus = None if self._service: self._pservice.unregister_service(self._service) + +def get_bundle_path(): + return os.environ['SUGAR_BUNDLE_BUNDLE_PATH'] diff --git a/sugar/activity/activityservice.py b/sugar/activity/activityservice.py index defeb08..9a7efb3 100644 --- a/sugar/activity/activityservice.py +++ b/sugar/activity/activityservice.py @@ -52,9 +52,9 @@ class ActivityService(dbus.service.Object): return self._activity.get_id() @dbus.service.method(_ACTIVITY_INTERFACE) - def get_type(self): - """Get the activity type""" - return self._activity.get_type() + def get_service_name(self): + """Get the activity service name""" + return self._activity.get_service_name() @dbus.service.method(_ACTIVITY_INTERFACE) def get_shared(self): |