fix some messed up object_id usagesHEADmaster

2 files changed, 4 insertions, 4 deletions

diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py
index 180a9ad..1f5a15c 100644
--- a/src/jarabe/desktop/favoritesview.py
+++ b/src/jarabe/desktop/favoritesview.py
@@ -388,7 +388,7 @@ class ActivityIcon(CanvasIcon):
 
     def __datastore_listener_deleted_cb(self, **kwargs):
         for entry in self._journal_entries:
-            if (entry['tree_id'], entry['object_id']) == kwargs['object_id']:
+            if (entry['tree_id'], entry['version_id']) == kwargs['object_id']:
                 self._refresh()
                 break
 
diff --git a/src/jarabe/journal/palettes.py b/src/jarabe/journal/palettes.py
index ae46e0a..54f5719 100644
--- a/src/jarabe/journal/palettes.py
+++ b/src/jarabe/journal/palettes.py
@@ -125,7 +125,7 @@ class ObjectPalette(Palette):
 
     def __clipboard_get_func_cb(self, clipboard, selection_data, info, data):
         # Get hold of a reference so the temp file doesn't get deleted
-        self._temp_file_path = model.get_file(self._metadata['tree_id'])
+        self._temp_file_path = model.get_file((self._metadata['tree_id'], self._metdata['version_id']))
         logging.debug('__clipboard_get_func_cb %r' % self._temp_file_path)
         selection_data.set_uris(['file://' + self._temp_file_path])
 
@@ -139,14 +139,14 @@ class ObjectPalette(Palette):
         bundle = misc.get_bundle(self._metadata)
         if bundle is not None and registry.is_installed(bundle):
             registry.uninstall(bundle)
-        model.delete(self._metadata['tree_id'])
+        model.delete((self._metadata['tree_id'], self._metadata['version_id']))
 
     def __detail_activate_cb(self, menu_item):
         self.emit('detail-clicked')
 
     def __friend_selected_cb(self, menu_item, buddy):
         logging.debug('__friend_selected_cb')
-        file_name = model.get_file(self._metadata['tree_id'])
+        file_name = model.get_file((self._metadata['tree_id'], self._metadata['version_id']))
 
         title = str(self._metadata['title'])
         description = str(self._metadata.get('description', ''))