mpdclient: automatically re-enter idle mode, eliminate mpdclient_put_connection()

[ncmpc.git] / src / conf.c

diff --git a/src/conf.c b/src/conf.c
index 03ba80dd7407baa7ef78bc898e57afd785974b89..652628c3c3bbe616a07de240a7798db0ff1c8d48 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>
 
@@ -583,19 +582,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 +616,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 +652,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))
                {