diff options
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/model/MeshModel.py | 4 | ||||
| -rw-r--r-- | shell/model/homeactivity.py | 4 | ||||
| -rw-r--r-- | shell/view/frame/activitiestray.py | 4 | ||||
| -rw-r--r-- | shell/view/frame/activitybutton.py | 2 | ||||
| -rw-r--r-- | shell/view/home/MeshBox.py | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/shell/model/MeshModel.py b/shell/model/MeshModel.py index 32e213a..da5b3c2 100644 --- a/shell/model/MeshModel.py +++ b/shell/model/MeshModel.py @@ -39,8 +39,8 @@ class ActivityModel: def get_color(self): return XoColor(self.activity.props.color) - def get_service_name(self): - return self.bundle.service_name + def get_bundle_id(self): + return self.bundle.bundle_id class MeshModel(gobject.GObject): __gsignals__ = { diff --git a/shell/model/homeactivity.py b/shell/model/homeactivity.py index 1d29be2..72b661b 100644 --- a/shell/model/homeactivity.py +++ b/shell/model/homeactivity.py @@ -156,9 +156,9 @@ class HomeActivity(gobject.GObject): return self._window def get_type(self): - """Retrieve activity_info's "service_name" for future reference""" + """Retrieve the activity bundle id for future reference""" if self._activity_info: - return self._activity_info.service_name + return self._activity_info.bundle_id else: return None diff --git a/shell/view/frame/activitiestray.py b/shell/view/frame/activitiestray.py index e2a89dd..6f8e89e 100644 --- a/shell/view/frame/activitiestray.py +++ b/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) diff --git a/shell/view/frame/activitybutton.py b/shell/view/frame/activitybutton.py index 93933fe..0595a55 100644 --- a/shell/view/frame/activitybutton.py +++ b/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) diff --git a/shell/view/home/MeshBox.py b/shell/view/home/MeshBox.py index fa51487..efc4513 100644 --- a/shell/view/home/MeshBox.py +++ b/shell/view/home/MeshBox.py @@ -274,7 +274,7 @@ class ActivityView(hippo.CanvasBox): del self._icons[key] def _clicked_cb(self, item): - bundle_id = self._model.get_service_name() + bundle_id = self._model.get_bundle_id() self._shell.join_activity(bundle_id, self._model.get_id()) class MeshBox(hippo.CanvasBox): |