[maemo-commits] [maemo-commits] r11776 - in projects/haf/trunk/gtk+: . gtk

[From: subversion at stage.maemo.org]

Author: tko
Date: 2007-05-23 15:20:27 +0300 (Wed, 23 May 2007)
New Revision: 11776

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkselection.c
Log:
Merged fix for wrong g_convert_with_fallback call

2007-05-23  Tommi Komulainen  <tommi.komulainen at nokia.com>

	Merge from trunk:

	2007-04-14  Yevgen Muntyan <muntyan at tamu.edu>

	* gtk/gtkselection.c (selection_get_text_plain): fixed
	wrong g_convert_with_fallback() call which caused
	gtk_selection_data_get_text() return invalid UTF-8 for
	non-ASCII text in text/plain selection (#382824).


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-05-23 12:06:37 UTC (rev 11775)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-05-23 12:20:27 UTC (rev 11776)
@@ -1,5 +1,16 @@
 2007-05-23  Tommi Komulainen  <tommi.komulainen at nokia.com>
 
+	Merge from trunk:
+
+	2007-04-14  Yevgen Muntyan <muntyan at tamu.edu>
+
+	* gtk/gtkselection.c (selection_get_text_plain): fixed
+	wrong g_convert_with_fallback() call which caused
+	gtk_selection_data_get_text() return invalid UTF-8 for
+	non-ASCII text in text/plain selection (#382824).
+
+2007-05-23  Tommi Komulainen  <tommi.komulainen at nokia.com>
+
 	* gdk/x11/gdksettings.c (gdk_settings_names, gdk_settings_map): add
 	forgotten MAEMO_CHANGES
 

Modified: projects/haf/trunk/gtk+/gtk/gtkselection.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkselection.c	2007-05-23 12:06:37 UTC (rev 11775)
+++ projects/haf/trunk/gtk+/gtk/gtkselection.c	2007-05-23 12:20:27 UTC (rev 11776)
@@ -1310,7 +1310,7 @@
     {
       gchar *tmp = str;
       str = g_convert_with_fallback (tmp, len, 
-				     charset, "UTF-8", 
+				     "UTF-8", charset,
 				     NULL, NULL, &len, &error);
       g_free (tmp);