screen_keydef: support adding keys with CMD_ADD

[ncmpc.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 511ebaaebdb1a0367e6321e2f3c242e27af86bb7..ffc310fcee2b183d862c77e9c2bf83f8166929df 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -27,7 +27,7 @@
 #include "ncu.h"
 #include "screen.h"
 #include "screen_utils.h"
-#include "screen_message.h"
+#include "screen_status.h"
 #include "strfsong.h"
 #include "i18n.h"
 #include "player_command.h"
@@ -271,7 +271,12 @@ default_settings_name(void)
 
        return name;
 #else
-       return g_strdup(options.host);
+       /*
+        * localhost is actually not correct, we only know that
+        * mpd_connection_new() has connected to the "default host".
+        */
+       const char *name = options.host ?: "localhost";
+       return g_strdup(name);
 #endif
 }
 
@@ -288,12 +293,7 @@ connection_settings_name(const struct mpd_connection *connection)
 #else
        (void)connection;
 
-       /*
-        * localhost is actually not correct, we only know that
-        * mpd_connection_new() has connected to the "default host".
-        */
-       const char *name = options.host ?: "localhost";
-       return g_strdup(name);
+       return default_settings_name();
 #endif
 }
 
@@ -313,14 +313,14 @@ timer_reconnect(G_GNUC_UNUSED gpointer data)
 
        char *name = default_settings_name();
        screen_status_printf(_("Connecting to %s...  [Press %s to abort]"),
-                            name, get_key_names(CMD_QUIT,0) );
+                            name, get_key_names(CMD_QUIT, false));
        g_free(name);
        doupdate();
 
        mpdclient_disconnect(mpd);
        success = mpdclient_connect(mpd,
                                    options.host, options.port,
-                                   5000,
+                                   options.timeout_ms,
                                    options.password);
        if (!success) {
                /* try again in 5 seconds */
@@ -527,7 +527,7 @@ timer_check_key_bindings(G_GNUC_UNUSED gpointer data)
           and this is a hint for the user what to press to correct
           that */
        g_snprintf(comment, sizeof(comment), _("press %s for the key editor"),
-                  get_key_names(CMD_SCREEN_KEYDEF, 0));
+                  get_key_names(CMD_SCREEN_KEYDEF, false));
        g_strlcat(buf, comment, sizeof(buf));
        g_strlcat(buf, ")", sizeof(buf));
 #endif