From: Nikolas Garofil <nikolas@garofil.be>
Date: Wed, 5 May 2010 20:13:09 +0000 (+0200)
Subject: Bugfix: $alignr only worked on the first line of $execp, $execpi, $lua and $lua_parse
X-Git-Url: http://vcs.maemo.org/git/?p=monky;a=commitdiff_plain;h=691036e3c37abc072e45ec84a35d0567a3702599

Bugfix: $alignr only worked on the first line of $execp, $execpi, $lua and $lua_parse
---

diff --git a/src/conky.c b/src/conky.c
index ad129c0..2ae447e 100644
--- 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;