From 4ebc713e561b44eef33d9b0d527d9ef2b646a1b4 Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <[EMAIL PROTECTED]>
Date: Sun, 6 Apr 2008 19:31:24 +0200
Subject: [PATCH] Identify bundles also by their version number.
---
journaltoolbox.py | 5 ++++-
misc.py | 6 ++++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/journaltoolbox.py b/journaltoolbox.py
index 630d245..6bcc9c8 100644
--- a/journaltoolbox.py
+++ b/journaltoolbox.py
@@ -256,7 +256,10 @@ class SearchToolbar(gtk.Toolbar):
appended_separator = False
for service_name in datastore.get_unique_values('activity'):
- activity_info = activity.get_registry().get_activity(service_name)
+ # TODO: Journal entries should also store the version of the
+ # bundle that was used.
+ registry = activity.get_registry()
+ activity_info = registry.get_activity(service_name, -1)
if not activity_info is None:
if not appended_separator:
self._what_search_combo.append_separator()
diff --git a/misc.py b/misc.py
index 652930e..49a536c 100644
--- a/misc.py
+++ b/misc.py
@@ -65,8 +65,10 @@ def get_icon_name(jobject):
file_name = _get_icon_file_name('application-octet-stream')
if not file_name and jobject.metadata['activity']:
- service_name = jobject.metadata['activity']
- activity_info = activity.get_registry().get_activity(service_name)
+ bundle_id = jobject.metadata['activity']
+ # TODO: Journal entries should also store the version of the
+ # bundle that was used.
+ activity_info = activity.get_registry().get_activity(bundle_id, -1)
if activity_info:
file_name = activity_info.icon
--
1.5.2.5
_______________________________________________
Sugar mailing list
[email protected]
http://lists.laptop.org/listinfo/sugar
