diff options
| author | Dana Jansens <danakj@orodu.net> | 2003-04-19 02:26:53 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2003-04-19 02:26:53 +0000 |
| commit | bcbe5c8f823cc12bd64feb2cf87d981e4f8c99fa (patch) | |
| tree | 1c7c01393e04b5d8f2d21ab32d7e9d76a1a72b8b | |
| parent | be6d54a0e8ee87c32ded68451430dda0258da05b (diff) | |
convert STRING properties from "ISO-8859-1" instead of from the current locale, since this is what they apparently are, according to gdk.
| -rw-r--r-- | openbox/prop.c | 6 |
1 files changed, 4 insertions, 2 deletions
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 */ |