From acd8095a29f2f922acce3e907fb71a6019eff113 Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Tue, 17 Aug 2010 14:57:02 +0000
Subject: Revert "Support dropped for activity.info fields 'service_name' and 'class'"

This reverts commit e11b7d319626691a18db3b3e87f5f66c04102695.
---
diff --git a/src/sugar/bundle/activitybundle.py b/src/sugar/bundle/activitybundle.py
index fe241f3..c83257f 100644
--- a/src/sugar/bundle/activitybundle.py
+++ b/src/sugar/bundle/activitybundle.py
@@ -71,7 +71,7 @@ class ActivityBundle(Bundle):
             self._parse_linfo(linfo_file)
 
         if self._local_name == None:
-            self._local_name = self._name
+           self._local_name = self._name
 
     def _get_manifest(self):
         if self._manifest is None:
@@ -149,6 +149,9 @@ class ActivityBundle(Bundle):
 
         if cp.has_option(section, 'bundle_id'):
             self._bundle_id = cp.get(section, 'bundle_id')
+        # FIXME deprecated
+        elif cp.has_option(section, 'service_name'):
+            self._bundle_id = cp.get(section, 'service_name')
         else:
             raise MalformedBundleException(
                 'Activity bundle %s does not specify a bundle id' %
@@ -160,7 +163,10 @@ class ActivityBundle(Bundle):
             raise MalformedBundleException(
                 'Activity bundle %s does not specify a name' % self._path)
 
-        if cp.has_option(section, 'exec'):
+        # FIXME class is deprecated
+        if cp.has_option(section, 'class'):
+            self.activity_class = cp.get(section, 'class')
+        elif cp.has_option(section, 'exec'):
             self.bundle_exec = cp.get(section, 'exec')
         else:
             raise MalformedBundleException(
--
cgit v0.9.1