dont set ret unless you will be returning TRUE

This commit is contained in:
Dana Jansens 2003-10-10 04:33:12 +00:00
parent 6dddd86975
commit 364bb1550a

View file

@ -289,12 +289,16 @@ gboolean prop_get_string_locale(Window win, Atom prop, char **ret)
{ {
char **list; char **list;
int nstr; int nstr;
char *s;
if (get_stringlist(win, prop, &list, &nstr) && nstr) { 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); NULL, NULL, NULL);
XFreeStringList(list); XFreeStringList(list);
if (*ret) return TRUE; if (s) {
*ret = s;
return TRUE;
}
} }
return FALSE; return FALSE;
} }