all repos — openbox @ 364bb1550abd7e586b3c148dfe2fb80eb73e48c9

openbox fork - make it a bit more like ryudo

dont set ret unless you will be returning TRUE
Dana Jansens danakj@orodu.net
commit

364bb1550abd7e586b3c148dfe2fb80eb73e48c9

parent

6dddd86975ef0e5bfa2924f6136d76fe587198d8

1 files changed, 6 insertions(+), 2 deletions(-)

jump to
M openbox/prop.copenbox/prop.c

@@ -289,12 +289,16 @@ gboolean prop_get_string_locale(Window win, Atom prop, char **ret)

{ char **list; int nstr; + char *s; if (get_stringlist(win, prop, &list, &nstr) && nstr) { - *ret = g_convert(list[0], strlen(list[0]), "UTF-8", "ISO-8859-1", + s = g_convert(list[0], strlen(list[0]), "UTF-8", "ISO-8859-1", NULL, NULL, NULL); XFreeStringList(list); - if (*ret) return TRUE; + if (s) { + *ret = s; + return TRUE; + } } return FALSE; }