patches/glib-02-convert-utf8.diff
author dcarbery
Fri, 24 Nov 2006 16:37:59 +0000
branch217update
changeset 19096 d542fc2c823e
parent 5518 235b0b4aa324
permissions -rw-r--r--
Merged trunk changes r9797:9829 into 217update branch.

--- glib-2.4.1.orig/glib/gconvert.c	2004-04-23 22:12:54.000000000 +0800
+++ glib-2.4.1.new/glib/gconvert.c	2004-09-29 16:17:18.000000000 +0800
@@ -1138,6 +1138,8 @@ g_filename_to_utf8 (const gchar *opsysst
 {
   const gchar *charset;
 
+  if (g_utf8_validate (opsysstring, -1, NULL))
+     return strdup_len (opsysstring, len, bytes_read, bytes_written, error);
   if (get_filename_charset (&charset))
     return strdup_len (opsysstring, len, bytes_read, bytes_written, error);
   else