Bugfix: compilation without X11 broke after latest patches
authorNikolas Garofil <garo@dunaldi.garofil.be>
Mon, 13 Apr 2009 12:42:31 +0000 (14:42 +0200)
committerNikolas Garofil <garo@dunaldi.garofil.be>
Mon, 13 Apr 2009 12:42:31 +0000 (14:42 +0200)
ChangeLog
src/conky.c

index 65a7231..d3d2c7e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2009-04-13
+       * Fix broken compilation without X11
+
 2009-04-09
        * Fix broken xmms2 compilation (thanks fusetak)
        * Minor fix for fs_used_perc, fs_free and fs_free_perc (thanks
index 341fca5..c9b084f 100644 (file)
@@ -7486,15 +7486,13 @@ static void load_config_file_x11(const char *f)
                        }
                }
 #endif
-#endif /* X11 */
                CONF("text") {
-#ifdef X11
                        //initialize X11 if nothing X11-related is mentioned before TEXT (and if X11 is the default outputmethod)
                        if(output_methods & TO_X) {
                                X11_initialisation();
                        }
-#endif
                }
+#endif /* X11 */
 #undef CONF
 #undef CONF2
        }