workaround for libncurses macro warnings

[ncmpc.git] / src / conf.c

diff --git a/src/conf.c b/src/conf.c
index 3ec37b855776cde142e8eae35e854daa45bb835a..ea35486b9f2f4d5dab630e782ae0de7c7bd23cc6 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -1,5 +1,5 @@
 /* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 The Music Player Daemon Project
+ * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
  
  * This program is free software; you can redistribute it and/or modify
@@ -77,6 +77,7 @@
 #define CONF_DISPLAY_TIME "display-time"
 #define CONF_JUMP_PREFIX_ONLY "jump-prefix-only"
 #define CONF_LYRICS_AUTOSAVE "lyrics-autosave"
+#define CONF_SECOND_COLUMN "second-column"
 
 static bool
 str2bool(char *str)
@@ -301,10 +302,8 @@ check_screen_list(char *value)
 {
        char **tmp = g_strsplit_set(value, " \t,", 100);
        char **screen = NULL;
-       int i,j;
+       int i = 0, j = 0;
 
-       i=0;
-       j=0;
        while( tmp && tmp[i] ) {
                char *name = g_ascii_strdown(tmp[i], -1);
                if (*name != '\0') {
@@ -372,13 +371,12 @@ get_search_mode(char *value)
 static bool
 parse_line(char *line)
 {
-       size_t len = strlen(line), i = 0, j;
+       size_t len = strlen(line), i = 0, j = 0;
        char name[MAX_LINE_LENGTH];
        char value[MAX_LINE_LENGTH];
        bool match_found;
 
        /* get the name part */
-       j = 0;
        while (i < len && line[i] != '=' &&
               !g_ascii_isspace(line[i])) {
                name[j++] = line[i++];
@@ -522,6 +520,12 @@ parse_line(char *line)
                options.lyrics_autosave = str2bool(value);
 #else
        {}
+#endif
+       else if (!strcasecmp(CONF_SECOND_COLUMN, name))
+#ifdef NCMPC_MINI
+               {}
+#else
+               options.second_column = str2bool(value);
 #endif
        else
                match_found = false;