forked from AuroraMiddleware/gtk
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)
This commit is contained in:
parent
d146290c53
commit
2a80b70a2e
@ -1,3 +1,11 @@
|
||||
2001-08-08 HideToshi Tajima <tajima@eng.sun.com>
|
||||
|
||||
* 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)
|
||||
|
||||
2001-08-08 Matthias Clasen <matthiasc@waldgeist.poet.de>
|
||||
|
||||
* gtk/gtktreestore.c (gtk_tree_store_iter_n_children): Don't
|
||||
|
@ -1,3 +1,11 @@
|
||||
2001-08-08 HideToshi Tajima <tajima@eng.sun.com>
|
||||
|
||||
* 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)
|
||||
|
||||
2001-08-08 Matthias Clasen <matthiasc@waldgeist.poet.de>
|
||||
|
||||
* gtk/gtktreestore.c (gtk_tree_store_iter_n_children): Don't
|
||||
|
@ -1,3 +1,11 @@
|
||||
2001-08-08 HideToshi Tajima <tajima@eng.sun.com>
|
||||
|
||||
* 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)
|
||||
|
||||
2001-08-08 Matthias Clasen <matthiasc@waldgeist.poet.de>
|
||||
|
||||
* gtk/gtktreestore.c (gtk_tree_store_iter_n_children): Don't
|
||||
|
@ -1,3 +1,11 @@
|
||||
2001-08-08 HideToshi Tajima <tajima@eng.sun.com>
|
||||
|
||||
* 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)
|
||||
|
||||
2001-08-08 Matthias Clasen <matthiasc@waldgeist.poet.de>
|
||||
|
||||
* gtk/gtktreestore.c (gtk_tree_store_iter_n_children): Don't
|
||||
|
@ -1,3 +1,11 @@
|
||||
2001-08-08 HideToshi Tajima <tajima@eng.sun.com>
|
||||
|
||||
* 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)
|
||||
|
||||
2001-08-08 Matthias Clasen <matthiasc@waldgeist.poet.de>
|
||||
|
||||
* gtk/gtktreestore.c (gtk_tree_store_iter_n_children): Don't
|
||||
|
@ -1,3 +1,11 @@
|
||||
2001-08-08 HideToshi Tajima <tajima@eng.sun.com>
|
||||
|
||||
* 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)
|
||||
|
||||
2001-08-08 Matthias Clasen <matthiasc@waldgeist.poet.de>
|
||||
|
||||
* gtk/gtktreestore.c (gtk_tree_store_iter_n_children): Don't
|
||||
|
@ -1,3 +1,11 @@
|
||||
2001-08-08 HideToshi Tajima <tajima@eng.sun.com>
|
||||
|
||||
* 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)
|
||||
|
||||
2001-08-08 Matthias Clasen <matthiasc@waldgeist.poet.de>
|
||||
|
||||
* gtk/gtktreestore.c (gtk_tree_store_iter_n_children): Don't
|
||||
|
@ -639,6 +639,7 @@ gdk_utf8_to_compound_text (const gchar *str,
|
||||
|
||||
result = gdk_string_to_compound_text (locale_str,
|
||||
encoding, format, ctext, length);
|
||||
result = (result == Success? TRUE : FALSE);
|
||||
|
||||
g_free (locale_str);
|
||||
|
||||
|
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user