Add an option for saving clipboard objects to the Journal.

3 files changed, 14 insertions, 7 deletions

diff --git a/services/clipboard/clipboardobject.py b/services/clipboard/clipboardobject.py
index d712e09..6505f1d 100644
--- a/services/clipboard/clipboardobject.py
+++ b/services/clipboard/clipboardobject.py
@@ -71,5 +71,5 @@ class Format:
     def _set_data(self, data):
         self._data = data
 
-    def get_on_disk(self):
+    def is_on_disk(self):
         return self._on_disk
diff --git a/services/clipboard/clipboardservice.py b/services/clipboard/clipboardservice.py
index 8b2d836..aab97de 100644
--- a/services/clipboard/clipboardservice.py
+++ b/services/clipboard/clipboardservice.py
@@ -31,6 +31,10 @@ PREVIEW_KEY = 'PREVIEW'
 ACTIVITY_KEY = 'ACTIVITY'
 FORMATS_KEY = 'FORMATS'
 
+TYPE_KEY = 'TYPE'
+DATA_KEY = 'DATA'
+ON_DISK_KEY = 'ON_DISK'
+
 class ClipboardService(dbus.service.Object):
 
     _CLIPBOARD_DBUS_INTERFACE = "org.laptop.Clipboard"
@@ -58,7 +62,7 @@ class ClipboardService(dbus.service.Object):
             return
 
         format = formats.values()[0]
-        if not format.get_on_disk():
+        if not format.is_on_disk():
             return
 
         if not len(cb_object.get_activity()):
@@ -154,12 +158,15 @@ class ClipboardService(dbus.service.Object):
         return dbus.Dictionary(result_dict)
 
     @dbus.service.method(_CLIPBOARD_DBUS_INTERFACE,
-                         in_signature="os", out_signature="ay")
+                         in_signature="os", out_signature="a{sv}")
     def get_object_data(self, object_path, format_type):       
         cb_object = self._objects[str(object_path)]
-        formats = cb_object.get_formats()
-        return dbus.ByteArray(formats[format_type].get_data())
-    
+        format = cb_object.get_formats()[format_type]
+        result_dict = {TYPE_KEY: format.get_type(),
+                DATA_KEY: dbus.ByteArray(format.get_data()),
+                ON_DISK_KEY: format.is_on_disk()}
+        return dbus.Dictionary(result_dict)
+
     # dbus signals
     @dbus.service.signal(_CLIPBOARD_DBUS_INTERFACE, signature="os")
     def object_added(self, object_path, name):
diff --git a/services/clipboard/objecttypeservice.py b/services/clipboard/objecttypeservice.py
index d1bcd49..f24640a 100644
--- a/services/clipboard/objecttypeservice.py
+++ b/services/clipboard/objecttypeservice.py
@@ -33,7 +33,7 @@ class ObjectTypeRegistry(dbus.service.Object):
                             [ 'text/plain', 'text/rtf', 'application/pdf',
                               'application/x-pdf' ])
         self._add_primitive('Image', _('Image'), 'theme:object-image',
-                            [ 'image/png' ])
+                            [ 'image/png', 'image/gif', 'image/jpeg' ])
 
     def _add_primitive(self, type_id, name, icon, mime_types):
         object_type = {'type_id': type_id,