diff options
| author | Simon Schampijer <simon@schampijer.de> | 2009-01-16 12:48:13 (GMT) |
|---|---|---|
| committer | Simon Schampijer <simon@schampijer.de> | 2009-01-16 12:48:13 (GMT) |
| commit | 7a30d9b504090ecc3ed1319245bb0240914494d8 (patch) | |
| tree | b5fed7e1a57a0d1066f4a1fb86a629340f9e2aae /src/jarabe | |
| parent | 653de31eed0619c0e7356c45d8932ac4c9574fc5 (diff) | |
| parent | b5e682b909633af66f633ea49024a1583e7db65b (diff) | |
Merge branch 'master' of gitorious@git.sugarlabs.org:sugar/mainline
Diffstat (limited to 'src/jarabe')
| -rw-r--r-- | src/jarabe/journal/journalactivity.py | 2 | ||||
| -rw-r--r-- | src/jarabe/journal/misc.py | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/jarabe/journal/journalactivity.py b/src/jarabe/journal/journalactivity.py index 3da689b..4aa7cf8 100644 --- a/src/jarabe/journal/journalactivity.py +++ b/src/jarabe/journal/journalactivity.py @@ -284,7 +284,7 @@ class JournalActivity(Window): if metadata['mime_type'] == JournalEntryBundle.MIME_TYPE: model.delete(object_id) - metadata['activity'] = bundle.get_bundle_id() + metadata['bundle_id'] = bundle.get_bundle_id() model.write(metadata) def search_grab_focus(self): diff --git a/src/jarabe/journal/misc.py b/src/jarabe/journal/misc.py index 699ac21..6346e50 100644 --- a/src/jarabe/journal/misc.py +++ b/src/jarabe/journal/misc.py @@ -48,9 +48,12 @@ def _get_icon_file_name(icon_name): def get_icon_name(metadata): file_name = None - if metadata.get('activity', ''): - service_name = metadata['activity'] - activity_info = bundleregistry.get_registry().get_bundle(service_name) + bundle_id = metadata.get('activity', '') + if not bundle_id: + bundle_id = metadata.get('bundle_id', '') + + if bundle_id: + activity_info = bundleregistry.get_registry().get_bundle(bundle_id) if activity_info: file_name = activity_info.get_icon() |