Merge branch 'master' of git://git.sugarlabs.org/sugar/mainline

1 files changed, 9 insertions, 1 deletions

diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py
index 81f2730..9371858 100644
--- a/src/jarabe/desktop/favoritesview.py
+++ b/src/jarabe/desktop/favoritesview.py
@@ -41,6 +41,7 @@ from jarabe.model.buddy import BuddyModel
 from jarabe.model import shell
 from jarabe.model import bundleregistry
 from jarabe import journal
+from jarabe.controlpanel.gui import ControlPanel
 
 from jarabe.desktop import schoolserver
 from jarabe.desktop.schoolserver import RegisterError
@@ -441,7 +442,14 @@ class ActivityIcon(CanvasIcon):
         if error is not None:
             logging.error('Error retrieving most recent activities: %r' % error)
 
-        self._journal_entries = entries
+        # If there's a problem with the DS index, we may get entries not related
+        # to this activity.
+        checked_entries = []
+        for entry in entries:
+            if entry['activity'] == self.bundle_id:
+                checked_entries.append(entry)
+
+        self._journal_entries = checked_entries
         self._update()
 
     def _update(self):