Update copyright stuff, fix conky.conf weirdness.

[monky] / src / x11.c

diff --git a/src/x11.c b/src/x11.c
index 0e48bd1..d9b93c5 100644 (file)
--- a/src/x11.c
+++ b/src/x11.c
@@ -7,7 +7,7 @@
  * Please see COPYING for details
  *
  * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
- * Copyright (c) 2005-2008 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al.
  *     (see AUTHORS)
  * All rights reserved.
  *
@@ -25,25 +25,26 @@
  *
  */
 
+#include "config.h"
 #include "conky.h"
+#include "logging.h"
+#include "common.h"
 
-#ifdef X11
+#include "x11.h"
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 #include <X11/Xmd.h>
 #include <X11/Xutil.h>
+
 #ifdef XFT
 #include <X11/Xft/Xft.h>
+int use_xft = 0;
 #endif
 
 #ifdef HAVE_XDBE
 int use_xdbe;
 #endif
 
-#ifdef XFT
-int use_xft = 0;
-#endif
-
 /* some basic X11 stuff */
 Display *display;
 int display_width;
@@ -560,4 +561,3 @@ void update_x11info(void)
        current_info->x11.monitor.number = XScreenCount(display);
        current_info->x11.monitor.current = XDefaultScreen(display);
 }
-#endif /* X11 */