[gtk+/gtk-3-22] clipboard: Try the mimetype first

[Matthias Clasen <matthiasc src gnome org>]

commit 7d9450fb60b03dcead85a462f30f24e60119c520
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed May 3 17:08:29 2017 -0400

    clipboard: Try the mimetype first
    
    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

 gtk/gtkclipboard.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtkclipboard.c b/gtk/gtkclipboard.c
index 06a8a39..7de4f60 100644
--- a/gtk/gtkclipboard.c
+++ b/gtk/gtkclipboard.c
@@ -1042,7 +1042,14 @@ request_text_received_func (GtkClipboard     *clipboard,
        */
       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,
                                          gdk_atom_intern_static_string ("COMPOUND_TEXT"), 
@@ -1093,7 +1100,7 @@ gtk_clipboard_request_text (GtkClipboard                *clipboard,
   info->callback = callback;
   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,
                                  info);
 }