2008-10-10 Gonzalo Paniagua Javier <gonzalo@novell.com>

	* assembly.c:
	* locales.c: remove the use of g_strdown. Fixes bug #322313.

svn path=/trunk/mono/; revision=115457

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 2382297f85bc8c7bfb960c4ac4927cbef195a84f..663e7f45c59d25550233432a4f8baf14849e6b99 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,4 +1,9 @@
 
+2008-10-10 Gonzalo Paniagua Javier <gonzalo@novell.com>
+
+       * assembly.c:
+       * locales.c: remove the use of g_strdown. Fixes bug #322313.
+
 Fri Oct 10 17:01:42 CEST 2008 Paolo Molaro <lupus@ximian.com>
 
        * assembly.c: in mono_assembly_load_friends() take the assemblies lock

diff --git a/mono/metadata/assembly.c b/mono/metadata/assembly.c
index 5c466be5acccceb67a51542fc193dfc3c5a6878a..1f2cc23f2004e0fedf5c4c7ddb05539860538b62 100644 (file)
--- a/mono/metadata/assembly.c
+++ b/mono/metadata/assembly.c
@@ -2003,10 +2003,9 @@ mono_assembly_load_publisher_policy (MonoAssemblyName *aname)
        } else
                name = g_strdup (aname->name);
        
-       if (aname->culture) {
-               culture = g_strdup (aname->culture);
-               g_strdown (culture);
-       } else
+       if (aname->culture)
+               culture = g_utf8_strdown (aname->culture, -1);
+       else
                culture = g_strdup ("");
        
        pname = g_strdup_printf ("policy.%d.%d.%s", aname->major, aname->minor, name);
@@ -2158,8 +2157,7 @@ mono_assembly_load_from_gac (MonoAssemblyName *aname,  gchar *filename, MonoImag
        }
 
        if (aname->culture) {
-               culture = g_strdup (aname->culture);
-               g_strdown (culture);
+               culture = g_utf8_strdown (aname->culture, -1);
        } else {
                culture = g_strdup ("");
        }

diff --git a/mono/metadata/locales.c b/mono/metadata/locales.c
index dd5c498564ecf2e96532dd8bc645360cdc38fd84..0e685c3c5ea5236761a24c5d50cba2ce63d4fb7c 100644 (file)
--- a/mono/metadata/locales.c
+++ b/mono/metadata/locales.c
@@ -420,7 +420,9 @@ get_current_locale_name (void)
        if ((c = strchr (corrected, '_')) != NULL)
                *c = '-';
 
-       g_strdown (corrected);
+       c = corrected;
+       corrected = g_ascii_strdown (c, -1);
+       g_free (c);
 
        return corrected;
 }