Bugfix: adding/removing use_xft in the config had no effect unless you restarted...

[monky] / src / conky.c

diff --git a/src/conky.c b/src/conky.c
index 790e93c..7a2adad 100644 (file)
--- a/src/conky.c
+++ b/src/conky.c
@@ -4265,6 +4265,9 @@ static void set_default_configurations(void)
        output_methods = TO_STDOUT;
 #endif
 #ifdef X11
+#ifdef BUILD_XFT
+       use_xft = 0;
+#endif
        show_graph_scale = 0;
        show_graph_range = 0;
        draw_shades = 1;
@@ -4295,11 +4298,11 @@ static void set_default_configurations(void)
        text_alignment = BOTTOM_LEFT;
        info.x11.monitor.number = 1;
        info.x11.monitor.current = 0;
-       info.x11.desktop.current = 1; 
+       info.x11.desktop.current = 1;
        info.x11.desktop.number = 1;
        info.x11.desktop.nitems = 0;
-       info.x11.desktop.all_names = NULL; 
-       info.x11.desktop.name = NULL; 
+       info.x11.desktop.all_names = NULL;
+       info.x11.desktop.name = NULL;
 #endif /* X11 */
 
        free_templates();
@@ -4622,7 +4625,7 @@ char load_config_file(const char *f)
                CONF("border_width") {
                        if (value) {
                                window.border_width = strtol(value, 0, 0);
-                               if (window.border_width < 0) window.border_width = 0;
+                               if (window.border_width < 1) window.border_width = 1;
                        } else {
                                CONF_ERR;
                        }
@@ -5944,7 +5947,13 @@ int main(int argc, char **argv)
 #endif /* XOAP */
 
 #ifdef HAVE_SYS_INOTIFY_H
-       inotify_fd = inotify_init1(IN_NONBLOCK);
+       inotify_fd = inotify_init();
+       if(inotify_fd != -1) {
+               int fl;
+
+               fl = fcntl(inotify_fd, F_GETFL);
+               fcntl(inotify_fd, F_SETFL, fl | O_NONBLOCK);
+       }
 #endif /* HAVE_SYS_INOTIFY_H */
 
        initialisation(argc, argv);