diff options
| author | Carlos Soriano <csoriano@gnome.org> | 2016-09-29 22:25:15 +0200 |
|---|---|---|
| committer | Carlos Soriano <csoriano@gnome.org> | 2016-09-29 22:32:35 +0200 |
| commit | 55cf522e8f8c728b9e901ac006005c248b0a878a (patch) | |
| tree | 96814a200b1c088e21963abd8ad34cdfb20cc952 /src/nautilus-files-view-dnd.c | |
| parent | b37950722078595699b127b154ea07e9c57cbc09 (diff) | |
| download | nautilus-55cf522e8f8c728b9e901ac006005c248b0a878a.tar.gz | |
general: rework clipboard handling
We were using a custom clipboard monitor, due to some old behaviour
in 2004 where not all X servers supported XFIXES, which allows to
monitor global clipboard changes between processes, which are needed in
Nautilus for copy, paste and link operations, and their availability
check.
Since Nautilus was a single process, it was working for most of the
time.
However recently we split the desktop in a different process, so we
were not able to correctly set the GDK action for clipboard, since
we were relying on sharing the same clipboard in the same process.
In order to fix this, this patch reworks the clipboard handling to a
more modern way, using the owner-changed signal present in XFIXES.
This fixes the clipboard changing between the desktop and Nautilus
and interproccess clipboard handling, fixes small corner cases, and
in the way this patch makes the code design and ownership of clipboard
more clearer.
https://bugzilla.gnome.org/show_bug.cgi?id=771046
Diffstat (limited to 'src/nautilus-files-view-dnd.c')
| -rw-r--r-- | src/nautilus-files-view-dnd.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/nautilus-files-view-dnd.c b/src/nautilus-files-view-dnd.c index 9f73624a5..b34e00f54 100644 --- a/src/nautilus-files-view-dnd.c +++ b/src/nautilus-files-view-dnd.c @@ -573,8 +573,7 @@ nautilus_files_view_drop_proxy_received_uris (NautilusFilesView *view, } nautilus_clipboard_clear_if_colliding_uris (GTK_WIDGET (view), - source_uri_list, - nautilus_files_view_get_copied_files_atom (view)); + source_uri_list); nautilus_files_view_move_copy_items (view, source_uri_list, NULL, target_uri != NULL ? target_uri : container_uri, |