projects
/
monky
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
13188c8
)
Bugfix: $alignr only worked on the first line of $execp, $execpi, $lua and $lua_parse
author
Nikolas Garofil
<nikolas@garofil.be>
Wed, 5 May 2010 20:13:09 +0000
(22:13 +0200)
committer
Nikolas Garofil
<nikolas@garofil.be>
Wed, 5 May 2010 20:13:09 +0000
(22:13 +0200)
src/conky.c
patch
|
blob
|
history
diff --git
a/src/conky.c
b/src/conky.c
index
ad129c0
..
2ae447e
100644
(file)
--- a/
src/conky.c
+++ b/
src/conky.c
@@
-2384,13
+2384,7
@@
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
-#ifdef HAVE_LUA
- && obj->type != OBJ_lua && obj->type != OBJ_lua_parse
-#endif /* HAVE_LUA */
- ) {
- substitute_newlines(p, a - 2);
- }
+ substitute_newlines(p, a - 2);
p += a;
p_max_size -= a;
(*p) = 0;