diff options
-rw-r--r-- | src/jarabe/frame/clipboardmenu.py | 8 | ||||
-rw-r--r-- | src/jarabe/journal/misc.py | 2 | ||||
-rw-r--r-- | src/jarabe/journal/model.py | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/jarabe/frame/clipboardmenu.py b/src/jarabe/frame/clipboardmenu.py index cab142e..be891d0 100644 --- a/src/jarabe/frame/clipboardmenu.py +++ b/src/jarabe/frame/clipboardmenu.py @@ -231,9 +231,8 @@ class ClipboardMenu(Palette): else: mime_type = sniffed_mime_type - name = self._cb_object.get_name() jobject = datastore.create() - jobject.metadata['title'] = _('%s clipping') % name + jobject.metadata['title'] = self._cb_object.get_name() jobject.metadata['keep'] = '0' jobject.metadata['buddies'] = '' jobject.metadata['preview'] = '' @@ -242,6 +241,9 @@ class ClipboardMenu(Palette): jobject.metadata['icon-color'] = color jobject.metadata['mime_type'] = mime_type jobject.file_path = file_path - datastore.write(jobject, transfer_ownership=transfer_ownership) + + uid = datastore.write(jobject, transfer_ownership=transfer_ownership) + + jobject.metadata['uid'] = uid return jobject diff --git a/src/jarabe/journal/misc.py b/src/jarabe/journal/misc.py index a4e4240..a3ba0cf 100644 --- a/src/jarabe/journal/misc.py +++ b/src/jarabe/journal/misc.py @@ -197,7 +197,7 @@ def resume(metadata, bundle_id=None): activity_id = metadata.get('activity_id', '') - if metadata['mountpoint'] == '/': + if metadata.get('mountpoint', '/') == '/': object_id = metadata['uid'] else: object_id = model.copy(metadata, '/') diff --git a/src/jarabe/journal/model.py b/src/jarabe/journal/model.py index 3a6efa1..9a686f8 100644 --- a/src/jarabe/journal/model.py +++ b/src/jarabe/journal/model.py @@ -347,7 +347,7 @@ def write(metadata, file_path='', update_mtime=True): metadata['mtime'] = datetime.now().isoformat() metadata['timestamp'] = int(time.time()) - if metadata['mountpoint'] == '/': + if metadata.get('mountpoint', '/') == '/': if metadata.get('uid', ''): object_id = _get_datastore().update(metadata['uid'], dbus.Dictionary(metadata), |