status_bar: remove the status bar clock (option "display-time")

[ncmpc.git] / src / conf.c

diff --git a/src/conf.c b/src/conf.c
index 5d8ec5e8bcbd9937ee64067948c08be6de20c65c..814a13b774486e2e204ee1d8bc61aba2ea12f8c6 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
@@ -24,15 +24,14 @@
 #include "command.h"
 #include "colors.h"
 #include "screen_list.h"
+#include "options.h"
 
 #include <assert.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <errno.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
-#include <fcntl.h>
 #include <glib.h>
 #include <glib/gstdio.h>
 
@@ -122,7 +121,7 @@ parse_key_value(char *str, char **end)
        }
 }
 
-static int
+static bool
 parse_key_definition(char *str)
 {
        /* get the command name */
@@ -139,7 +138,7 @@ parse_key_definition(char *str)
                /* the hotkey configuration contains an unknown
                   command */
                print_error(_("Unknown command"), buf);
-               return -1;
+               return false;
        }
 
        /* skip whitespace */
@@ -152,7 +151,7 @@ parse_key_definition(char *str)
        if (*buf == 0) {
                /* the hotkey configuration line is incomplete */
                print_error(_("Incomplete hotkey configuration"), str);
-               return -1;
+               return false;
        }
 
        /* parse key values */
@@ -170,7 +169,7 @@ parse_key_definition(char *str)
        }
 
        if (key < 0)
-               return -1;
+               return false;
 
        return assign_keys(cmd, keys);
 }
@@ -502,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
                {}
@@ -583,19 +579,19 @@ read_rc_file(char *filename)
        return 0;
 }
 
-int
+bool
 check_user_conf_dir(void)
 {
        char *directory = g_build_filename(g_get_home_dir(), "." PACKAGE, NULL);
 
        if (g_file_test(directory, G_FILE_TEST_IS_DIR)) {
                g_free(directory);
-               return 0;
+               return true;
        }
 
-       int retval = g_mkdir(directory, 0755);
+       bool success = g_mkdir(directory, 0755) == 0;
        g_free(directory);
-       return retval;
+       return success;
 }
 
 char *
@@ -617,7 +613,6 @@ build_system_conf_filename(void)
 
        for (system_data_dirs = g_get_system_config_dirs (); *system_data_dirs != NULL; system_data_dirs++)
        {
-               g_message (*system_data_dirs);
                pathname = g_build_filename(*system_data_dirs, PACKAGE, "ncmpc.conf", NULL);
                if (g_file_test(pathname, G_FILE_TEST_EXISTS))
                {
@@ -654,7 +649,6 @@ g_build_system_key_binding_filename(void)
 
        for (system_data_dirs = g_get_system_config_dirs (); *system_data_dirs != NULL; system_data_dirs++)
        {
-               g_message (*system_data_dirs);
                pathname = g_build_filename(*system_data_dirs, PACKAGE, "keys.conf", NULL);
                if (g_file_test(pathname, G_FILE_TEST_EXISTS))
                {