Fix alignment ($align[rc]) issue for exec & lua objects.
authorBrenden Matthews <brenden@diddyinc.com>
Fri, 18 Jun 2010 18:15:01 +0000 (11:15 -0700)
committerBrenden Matthews <brenden@diddyinc.com>
Fri, 18 Jun 2010 18:15:01 +0000 (11:15 -0700)
src/conky.c

index bf372c3..d9715f7 100644 (file)
@@ -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);