diff options
author | Dan Williams <dcbw@redhat.com> | 2007-04-11 19:08:40 (GMT) |
---|---|---|
committer | Dan Williams <dcbw@redhat.com> | 2007-04-11 19:08:40 (GMT) |
commit | 894fcea9fca5908efb8b4f0edb81f7f2f9f55464 (patch) | |
tree | d52f7366aa9fca79b9ca96bf8c01e79315f4ec2f /shell | |
parent | eeb09294d8713c6b8a1e3d7b8b53e692b989cdcb (diff) |
Remove get_default_type() and bundle default types; obsolete
Diffstat (limited to 'shell')
-rw-r--r-- | shell/model/MeshModel.py | 2 | ||||
-rw-r--r-- | shell/view/Shell.py | 7 | ||||
-rw-r--r-- | shell/view/home/MeshBox.py | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/shell/model/MeshModel.py b/shell/model/MeshModel.py index b14d6f7..dd25d9f 100644 --- a/shell/model/MeshModel.py +++ b/shell/model/MeshModel.py @@ -38,6 +38,8 @@ class ActivityModel: def get_color(self): return XoColor(self._activity.get_color()) + def get_service_name(self): + return self._bundle.get_service_name() class MeshModel(gobject.GObject): __gsignals__ = { diff --git a/shell/view/Shell.py b/shell/view/Shell.py index 6d74f29..391657d 100644 --- a/shell/view/Shell.py +++ b/shell/view/Shell.py @@ -114,19 +114,18 @@ class Shell(gobject.GObject): # we have a bundle on the system capable of handling # this activity type breg = self._model.get_bundle_registry() - bundle = breg.find_by_default_type(bundle_id) + bundle = breg.get_bundle(bundle_id) if not bundle: logging.error("Couldn't find activity for type %s" % bundle_id) return - act_type = bundle.get_service_name() home_model = self._model.get_home() - home_model.notify_activity_launch(activity_id, act_type) + home_model.notify_activity_launch(activity_id, bundle_id) handle = ActivityHandle(activity_id) handle.pservice_id = activity_id - handler = activityfactory.create(act_type, handle) + handler = activityfactory.create(bundle_id, handle) handler.connect('error', self._join_error_cb, home_model) def _start_error_cb(self, handler, err, home_model): diff --git a/shell/view/home/MeshBox.py b/shell/view/home/MeshBox.py index 40347f3..218a44d 100644 --- a/shell/view/home/MeshBox.py +++ b/shell/view/home/MeshBox.py @@ -189,7 +189,7 @@ class ActivityView(SnowflakeBox): del self._icons[key] def _clicked_cb(self, item): - bundle_id = self._model.get_service().get_type() + bundle_id = self._model.get_service().get_service_name() self._shell.join_activity(bundle_id, self._model.get_id()) class MeshBox(SpreadBox): |