From: Nikolas Garofil <garo@dunaldi.garofil.be>
Date: Mon, 13 Apr 2009 12:42:31 +0000 (+0200)
Subject: Bugfix: compilation without X11 broke after latest patches
X-Git-Url: https://vcs.maemo.org/git/?a=commitdiff_plain;h=86b91db30548a2d6d8733763f9b9feb60c949996;p=monky

Bugfix: compilation without X11 broke after latest patches
---

diff --git a/ChangeLog b/ChangeLog
index 65a7231..d3d2c7e 100644
--- 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
diff --git a/src/conky.c b/src/conky.c
index 341fca5..c9b084f 100644
--- a/src/conky.c
+++ b/src/conky.c
@@ -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
 	}