nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Dana Jansens 2003-04-19 02:26:53 +00:00
parent be6d54a0e8
commit bcbe5c8f82
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
openbox/prop.c
View file

@ -268,7 +268,8 @@ gboolean prop_get_string_locale(Window win, Atom prop, char **ret)
int nstr; int nstr;
if (get_stringlist(win, prop, &list, &nstr) && 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); XFreeStringList(list);
if (*ret) return TRUE; if (*ret) return TRUE;
} }
@ -286,7 +287,8 @@ gboolean prop_get_strings_locale(Window win, Atom prop, char ***ret)
p = raw; p = raw;
for (i = 0; i < num; ++i) { 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 */ /* make sure translation did not fail */
if (!(*ret)[i]) { if (!(*ret)[i]) {
g_strfreev(*ret); /* free what we did so far */ g_strfreev(*ret); /* free what we did so far */