projects
/
mikachu
/
openbox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6dddd86
)
dont set ret unless you will be returning TRUE
author
Dana Jansens
<danakj@orodu.net>
Fri, 10 Oct 2003 04:33:12 +0000
(
04:33
+0000)
committer
Dana Jansens
<danakj@orodu.net>
Fri, 10 Oct 2003 04:33:12 +0000
(
04:33
+0000)
openbox/prop.c
patch
|
blob
|
history
diff --git
a/openbox/prop.c
b/openbox/prop.c
index
16ab60c
..
98bbbd9
100644
(file)
--- a/
openbox/prop.c
+++ b/
openbox/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;
}