projects
/
monky
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6c26b12
)
Fix alignment ($align[rc]) issue for exec & lua objects.
author
Brenden Matthews
<brenden@diddyinc.com>
Fri, 18 Jun 2010 18:15:01 +0000
(11:15 -0700)
committer
Brenden Matthews
<brenden@diddyinc.com>
Fri, 18 Jun 2010 18:15:01 +0000
(11:15 -0700)
src/conky.c
patch
|
blob
|
history
diff --git
a/src/conky.c
b/src/conky.c
index
bf372c3
..
d9715f7
100644
(file)
--- a/
src/conky.c
+++ b/
src/conky.c
@@
-2380,9
+2380,10
@@
void generate_text_internal(char *p, int p_max_size,
#ifdef HAVE_ICONV
iconv_convert(&a, buff_in, p, p_max_size);
#endif /* HAVE_ICONV */
- if (obj->type != OBJ_text && obj->type != OBJ_execp && obj->type != OBJ_execpi
+ if (obj->type == OBJ_execp || obj->type == OBJ_execpi || obj->type
+ == OBJ_exec
#ifdef HAVE_LUA
- && obj->type != OBJ_lua && obj->type != OBJ_lua_parse
+ || obj->type == OBJ_lua || obj->type == OBJ_lua_parse
#endif /* HAVE_LUA */
) {
substitute_newlines(p, a - 2);