Ticket #3819: 0001-Bring-back-drag-and-drop-to-the-frame-clipboard-SL-3.patch

src/jarabe/frame/clipboard.py

@@ -85 +85 @@
         logging.debug('Clipboard.add_object_format')
         cb_object = self._objects[object_id]
 
+        if isinstance(format_type, Gdk.Atom):
+            format_type = str(format_type)
+
         if on_disk and cb_object.get_percent() == 100:
             new_uri = self._copy_file(data)
             cb_object.add_format(Format(format_type, new_uri, on_disk))

src/jarabe/frame/clipboardmenu.py

@@ -193 +193 @@
         most_significant_mime_type = mime.choose_most_significant(formats)
         format_ = self._cb_object.get_formats()[most_significant_mime_type]
 
+        # FIXME last character is 'x00'
+        format_data = format_.get_data()[:-1]
+
         transfer_ownership = False
         if most_significant_mime_type == 'text/uri-list':
-            uris = mime.split_uri_list(format_.get_data())
+            uris = mime.split_uri_list(format_data)
             if len(uris) == 1 and uris[0].startswith('file://'):
                 parsed_url = urlparse.urlparse(uris[0])
                 file_path = parsed_url.path  # pylint: disable=E1101
                 transfer_ownership = False
                 mime_type = mime.get_for_file(file_path)
             else:
-                file_path = self._write_to_temp_file(format_.get_data())
+                file_path = self._write_to_temp_file(format_data)
                 transfer_ownership = True
                 mime_type = 'text/uri-list'
         else:
             if format_.is_on_disk():
-                parsed_url = urlparse.urlparse(format_.get_data())
+                parsed_url = urlparse.urlparse(format_data)
                 file_path = parsed_url.path  # pylint: disable=E1101
                 transfer_ownership = False
                 mime_type = mime.get_for_file(file_path)
             else:
-                file_path = self._write_to_temp_file(format_.get_data())
+                file_path = self._write_to_temp_file(format_data)
                 transfer_ownership = True
                 sniffed_mime_type = mime.get_for_file(file_path)
                 if sniffed_mime_type == 'application/octet-stream':

src/jarabe/frame/clipboardobject.py

@@ -104 +104 @@
         format_ = mime.choose_most_significant(self._formats.keys())
         if format_ == 'text/uri-list':
             data = self._formats['text/uri-list'].get_data()
+            # FIXME last character is 'x00'
+            data = data[:-1]
             uri = urlparse.urlparse(mime.split_uri_list(data)[0], 'file')
             scheme = uri.scheme  # pylint: disable=E1101
             if scheme == 'file':

src/jarabe/frame/clipboardtray.py

@@ -76 +76 @@
         return False
 
     def _add_selection(self, object_id, selection):
-        if not selection.data:
+        if not selection.get_data():
             return
 
-        logging.debug('ClipboardTray: adding type %r', selection.type)
+        selection_data = selection.get_data()
+        selection_type = selection.get_data_type()
+
+        logging.debug('ClipboardTray: adding type %r', selection_type)
 
         cb_service = clipboard.get_instance()
-        if selection.type == 'text/uri-list':
-            uris = selection.data.split('\n')
+        if selection_type == 'text/uri-list':
+            uris = selection_data.split('\n')
             if len(uris) > 1:
                 raise NotImplementedError('Multiple uris in text/uri-list' \
                                           ' still not supported.')
 
             cb_service.add_object_format(object_id,
-                                         selection.type,
+                                         selection_type,
                                          uris[0],
                                          on_disk=True)
         else:
             cb_service.add_object_format(object_id,
-                                         selection.type,
-                                         selection.data,
+                                         selection_type,
+                                         selection_data,
                                          on_disk=False)
 
     def _object_added_cb(self, cb_service, cb_object):
@@ -132 +135 @@
         logging.debug('ClipboardTray._drag_motion_cb')
 
         if self._internal_drag(context):
-            context.drag_status(Gdk.DragAction.MOVE, time)
+            Gdk.drag_status(context, Gdk.DragAction.MOVE, time)
         else:
-            context.drag_status(Gdk.DragAction.COPY, time)
+            Gdk.drag_status(context, Gdk.DragAction.COPY, time)
             self.props.drag_active = True
 
         return True
@@ -148 +151 @@
         if self._internal_drag(context):
             # TODO: We should move the object within the clipboard here
             if not self._context_map.has_context(context):
-                context.drop_finish(False, Gtk.get_current_event_time())
+                Gdk.drop_finish(context, False, Gtk.get_current_event_time())
             return False
 
         cb_service = clipboard.get_instance()
         object_id = cb_service.add_object(name="")
 
-        self._context_map.add_context(context, object_id, len(context.targets))
+        context_targets = context.list_targets()
+        self._context_map.add_context(context, object_id, len(context_targets))
 
-        for target in context.targets:
+        for target in context_targets:
             if str(target) not in ('TIMESTAMP', 'TARGETS', 'MULTIPLE'):
                 widget.drag_get_data(context, target, time)
 
@@ -167 +171 @@
     def drag_data_received_cb(self, widget, context, x, y, selection,
                               targetType, time):
         logging.debug('ClipboardTray: got data for target %r',
-            selection.target)
+            selection.get_target())
 
         object_id = self._context_map.get_object_id(context)
         try:
             if selection is None:
                 logging.warn('ClipboardTray: empty selection for target %s',
-                    selection.target)
+                    selection.get_target())
             else:
                 self._add_selection(object_id, selection)
 
@@ -181 +185 @@
             # If it's the last target to be processed, finish
             # the dnd transaction
             if not self._context_map.has_context(context):
-                context.drop_finish(True, Gtk.get_current_event_time())
+                Gdk.drop_finish(context, True, Gtk.get_current_event_time())
 
     def _internal_drag(self, context):
-        source_widget = context.get_source_widget()
+        source_widget = Gtk.drag_get_source_widget(context)
         if source_widget is None:
             return False
         view_ancestor = source_widget.get_ancestor(Gtk.Viewport)