options: get_key_names: use bool

[ncmpc.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 1e7caeea8444a346c003466851c80ab3f254c5fa..ffc310fcee2b183d862c77e9c2bf83f8166929df 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #include "config.h"
 #include "ncmpc.h"
@@ -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"
@@ -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