aconnect: remove redundant #include, fixes windows build

[ncmpc.git] / src / conf.c

diff --git a/src/conf.c b/src/conf.c
index 171a9ee49d57d073f76e6f491c58efb5d8f126e7..496dcab6dc974cc429247fd0ee9fb54a1e9a92a2 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -1,5 +1,5 @@
 /* ncmpc (Ncurses MPD Client)
- * (c) 2004-2010 The Music Player Daemon Project
+ * (c) 2004-2017 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -209,12 +209,12 @@ separate_value(char *p)
        return g_strchug(value);
 }
 
-static int
+static bool
 parse_color(char *str)
 {
        char *value = separate_value(str);
        if (value == NULL)
-               return -1;
+               return false;
 
        return colors_assign(str, value);
 }
@@ -239,19 +239,19 @@ after_comma(char *p)
        return comma;
 }
 
-static int
+static bool
 parse_color_definition(char *str)
 {
        char *value = separate_value(str);
        if (value == NULL)
-               return -1;
+               return false;
 
        /* get the command name */
        short color = colors_str2color(str);
        if (color < 0) {
                char buf[MAX_LINE_LENGTH];
                print_error(_("Bad color name"), buf);
-               return -1;
+               return false;
        }
 
        /* parse r,g,b values */
@@ -261,13 +261,13 @@ parse_color_definition(char *str)
                char *next = after_comma(value), *endptr;
                if (*value == 0) {
                        print_error(_("Incomplete color definition"), str);
-                       return -1;
+                       return false;
                }
 
                rgb[i] = strtol(value, &endptr, 0);
                if (endptr == value || *endptr != 0) {
                        print_error(_("Invalid number"), value);
-                       return -1;
+                       return false;
                }
 
                value = next;
@@ -275,7 +275,7 @@ parse_color_definition(char *str)
 
        if (*value != 0) {
                print_error(_("Malformed color definition"), str);
-               return -1;
+               return false;
        }
 
        return colors_define(str, rgb[0], rgb[1], rgb[2]);
@@ -501,11 +501,8 @@ parse_line(char *line)
                g_free(options.scroll_sep);
                options.scroll_sep = get_format(value);
        } else if (!strcasecmp(CONF_DISPLAY_TIME, name))
-#ifdef NCMPC_MINI
+               /* obsolete, ignore */
                {}
-#else
-               options.display_time = str2bool(value);
-#endif
        else if (!strcasecmp(CONF_JUMP_PREFIX_ONLY, name))
 #ifdef NCMPC_MINI
                {}