AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

clipboard: Try the mimetype first

Browse Source 
Try text/plain;charset=utf-8 first, before falling back to
X11-isms like UTF8_TEXT. This makes things work on Wayland
compositors that don't carry a heavy X11 legacy around.

https://bugzilla.gnome.org/show_bug.cgi?id=781814
This commit is contained in:
Matthias Clasen 2017-05-03 17:08:29 -04:00
parent 1fb9db547d
commit 7d9450fb60
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gtk/gtkclipboard.c
View File

@ -1042,7 +1042,14 @@ request_text_received_func (GtkClipboard *clipboard,
*/ */
GdkAtom target = gtk_selection_data_get_target (selection_data); GdkAtom target = gtk_selection_data_get_target (selection_data);
if (target == gdk_atom_intern_static_string ("UTF8_STRING")) if (target == gdk_atom_intern_static_string ("text/plain;charset=utf-8"))
{
gtk_clipboard_request_contents (clipboard,
gdk_atom_intern_static_string ("UTF8_TEXT"),
request_text_received_func, info);
return;
}
else if (target == gdk_atom_intern_static_string ("UTF8_STRING"))
{ {
gtk_clipboard_request_contents (clipboard, gtk_clipboard_request_contents (clipboard,
gdk_atom_intern_static_string ("COMPOUND_TEXT"), gdk_atom_intern_static_string ("COMPOUND_TEXT"),
@ -1093,7 +1100,7 @@ gtk_clipboard_request_text (GtkClipboard *clipboard,
info->callback = callback; info->callback = callback;
info->user_data = user_data; info->user_data = user_data;
gtk_clipboard_request_contents (clipboard, gdk_atom_intern_static_string ("UTF8_STRING"), gtk_clipboard_request_contents (clipboard, gdk_atom_intern_static_string ("text/plain;charset=utf-8"),
request_text_received_func, request_text_received_func,
info); info);
} }