Rename activity service_name to bundle_id

shell/view/frame/activitiestray.py

@@ -91,9 +91,9 @@ class ActivitiesTray(hippo.CanvasBox):
 
         while activity_list:
             info = activity_list.pop()
-            name_to_activity[info.service_name] = info
+            name_to_activity[info.bundle_id] = info
 
-            if info.service_name in self._config:
+            if info.bundle_id in self._config:
                 known_activities.append(info)
             else:
                 unknown_activities.append(info)

shell/view/frame/activitybutton.py

@@ -47,7 +47,7 @@ class ActivityButton(TrayButton, gobject.GObject):
         self.setup_rollover_options()
 
     def get_bundle_id(self):
-        return self._activity_info.service_name
+        return self._activity_info.bundle_id
 
     def setup_rollover_options(self):
         palette = Palette(self._activity_info.name)