diff options
| author | Tomeu Vizoso <tomeu@tomeuvizoso.net> | 2008-10-08 17:46:39 (GMT) |
|---|---|---|
| committer | Tomeu Vizoso <tomeu@tomeuvizoso.net> | 2008-10-08 17:46:39 (GMT) |
| commit | d8b49945780f0373e39bd4e1bc238212f4adc47b (patch) | |
| tree | f9233d40feabf6d30c20079410ae2649ff140689 /src | |
| parent | ee4535c98ae74347e7072909d49dcf8a5e16ca7b (diff) | |
Some more missing renames
Diffstat (limited to 'src')
| -rw-r--r-- | src/jarabe/desktop/favoritesview.py | 3 | ||||
| -rw-r--r-- | src/jarabe/model/bundleregistry.py | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py index 1aa1c31..87e0f92 100644 --- a/src/jarabe/desktop/favoritesview.py +++ b/src/jarabe/desktop/favoritesview.py @@ -113,7 +113,8 @@ class FavoritesView(hippo.Canvas): def __activity_added_cb(self, activity_registry, activity_info): registry = bundleregistry.get_registry() - if registry.is_bundle_favorite(self._bundle_id, self._version): + if registry.is_bundle_favorite(activity_info.get_bundle_id(), + activity_info.get_activity_version()): self._add_activity(activity_info) def _find_activity_icon(self, bundle_id, version): diff --git a/src/jarabe/model/bundleregistry.py b/src/jarabe/model/bundleregistry.py index e760e58..600a108 100644 --- a/src/jarabe/model/bundleregistry.py +++ b/src/jarabe/model/bundleregistry.py @@ -284,7 +284,7 @@ class BundleRegistry(gobject.GObject): open(path, 'w').write(cjson.encode(favorites_data)) def is_installed(self, bundle): - return self.get_activity(bundle.get_bundle_id()) is not None + return self.get_bundle(bundle.get_bundle_id()) is not None def install(self, bundle): activities_path = env.get_user_activities_path() @@ -298,7 +298,7 @@ class BundleRegistry(gobject.GObject): raise RegistrationException def uninstall(self, bundle, force=False): - act = self.get_activity(bundle.get_bundle_id()) + act = self.get_bundle(bundle.get_bundle_id()) if not force and act.version != bundle.get_activity_version(): logging.warning('Not uninstalling, different bundle present') return @@ -314,7 +314,7 @@ class BundleRegistry(gobject.GObject): raise RegistrationException def upgrade(self, bundle): - act = self.get_activity(bundle.get_bundle_id()) + act = self.get_bundle(bundle.get_bundle_id()) if act is None: logging.warning('Activity not installed') elif act.path.startswith(env.get_user_activities_path()): |