Fix gcc warning

[monky] / src / conky.c

diff --git a/src/conky.c b/src/conky.c
index a289172..c8c55e7 100644 (file)
--- a/src/conky.c
+++ b/src/conky.c
@@ -2380,7 +2380,14 @@ 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 */
-                       substitute_newlines(p, a - 2);
+                       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
+#endif /* HAVE_LUA */
+                                       ) {
+                               substitute_newlines(p, a - 2);
+                       }
                        p += a;
                        p_max_size -= a;
                        (*p) = 0;
@@ -3987,7 +3994,8 @@ static void reload_config(void)
 }
 
 #ifdef X11
-void clean_up_x11() {
+void clean_up_x11(void)
+{
        if(window_created == 1) {
                XClearArea(display, window.window, text_start_x - window.border_inner_margin - window.border_outer_margin - window.border_width,
                        text_start_y - window.border_inner_margin - window.border_outer_margin - window.border_width,