diff options
| author | Hidetoshi Tajima <tajima@src.gnome.org> | 2001-08-08 17:58:52 +0000 |
|---|---|---|
| committer | Hidetoshi Tajima <tajima@src.gnome.org> | 2001-08-08 17:58:52 +0000 |
| commit | 2a80b70a2eaf6b6ef8e7ae14a0d4cca7ed63cf42 (patch) | |
| tree | a4c8e4e35e30e7fd642b7dbb8b7f9f9b57fd3d06 /gtk/gtkclipboard.c | |
| parent | d146290c53311124162dbc68a332cf2d9e8612bd (diff) | |
| download | gtk+-2a80b70a2eaf6b6ef8e7ae14a0d4cca7ed63cf42.tar.gz | |
ask apps for COMPOUND_TEXT instead of TEXT correctly interpret the return
* gtk/gtkclipboard.c (request_text_received_func): ask apps for
COMPOUND_TEXT instead of TEXT
* gdk/x11/gdkselection-x11.c (gdk_utf8_to_compound_text): correctly
interpret the return value of g_string_to_compound_text()
(#55152)
Diffstat (limited to 'gtk/gtkclipboard.c')
| -rw-r--r-- | gtk/gtkclipboard.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk/gtkclipboard.c b/gtk/gtkclipboard.c index c64d4c0b51..9022abb855 100644 --- a/gtk/gtkclipboard.c +++ b/gtk/gtkclipboard.c @@ -641,18 +641,18 @@ request_text_received_func (GtkClipboard *clipboard, if (!result) { - /* If we asked for UTF8 and didn't get it, try text; if we asked - * for text and didn't get it, try string. If we asked for - * anything else and didn't get it, give up. + /* If we asked for UTF8 and didn't get it, try compound_text; + * if we asked for compound_text and didn't get it, try string; + * If we asked for anything else and didn't get it, give up. */ if (selection_data->target == gdk_atom_intern ("UTF8_STRING", FALSE)) { gtk_clipboard_request_contents (clipboard, - gdk_atom_intern ("TEXT", FALSE), + gdk_atom_intern ("COMPOUND_TEXT", FALSE), request_text_received_func, info); return; } - else if (selection_data->target == gdk_atom_intern ("TEXT", FALSE)) + else if (selection_data->target == gdk_atom_intern ("COMPOUND_TEXT", FALSE)) { gtk_clipboard_request_contents (clipboard, GDK_TARGET_STRING, |