From: Dana Jansens <danakj@orodu.net>
Date: Sat, 19 Apr 2003 02:26:53 +0000 (+0000)
Subject: convert STRING properties from "ISO-8859-1" instead of from the current locale, since... 
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=bcbe5c8f823cc12bd64feb2cf87d981e4f8c99fa;p=chaz%2Fopenbox

convert STRING properties from "ISO-8859-1" instead of from the current locale, since this is what they apparently are, according to gdk.
---

diff --git a/openbox/prop.c b/openbox/prop.c
index df6cbbeb..e708b984 100644
--- a/openbox/prop.c
+++ b/openbox/prop.c
@@ -268,7 +268,8 @@ gboolean prop_get_string_locale(Window win, Atom prop, char **ret)
     int nstr;
 
     if (get_stringlist(win, prop, &list, &nstr) && nstr) {
-        *ret = g_locale_to_utf8(list[0], -1, NULL, NULL, NULL);
+        *ret = g_convert(list[0], strlen(list[0]), "UTF-8", "ISO-8859-1",
+                         NULL, NULL, NULL);
         XFreeStringList(list);
         if (*ret) return TRUE;
     }
@@ -286,7 +287,8 @@ gboolean prop_get_strings_locale(Window win, Atom prop, char ***ret)
 
         p = raw;
         for (i = 0; i < num; ++i) {
-            (*ret)[i] = g_locale_to_utf8(p, -1, NULL, NULL, NULL);
+            (*ret)[i] = g_convert(p, strlen(p), "UTF-8", "ISO-8859-1",
+                                  NULL, NULL, NULL);
             /* make sure translation did not fail */
             if (!(*ret)[i]) {
                 g_strfreev(*ret); /* free what we did so far */