Remove bundle specific stuff from env.

Move get_bundle_path to activity.

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']

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):

sugar/env.py

@@ -24,30 +24,12 @@ try:
 except ImportError:
     from sugar.__installed__ import *
 
-def get_bundle_path():
-    if os.environ.has_key('SUGAR_BUNDLE_PATH'):
-        return os.environ['SUGAR_BUNDLE_PATH']
-    else:
-        return None
-
 def is_emulator():
     if os.environ.has_key('SUGAR_EMULATOR'):
         if os.environ['SUGAR_EMULATOR'] == 'yes':
             return True
     return False
 
-def get_bundle_service_name():
-    if os.environ.has_key('SUGAR_BUNDLE_SERVICE_NAME'):
-        return os.environ['SUGAR_BUNDLE_SERVICE_NAME']
-    else:
-        return None
-
-def get_bundle_default_type():
-    if os.environ.has_key('SUGAR_BUNDLE_DEFAULT_TYPE'):
-        return os.environ['SUGAR_BUNDLE_DEFAULT_TYPE']
-    else:
-        return None
-
 def get_profile_path():
     if os.environ.has_key('SUGAR_PROFILE'):
         profile_id = os.environ['SUGAR_PROFILE']