use g_timeout_add_seconds() where appropriate

[ncmpc.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 8bfa03a86cff4bc8c0e9e06a55f7660b13159bf1..88660de05842e12fc4258c58da3a45f13547bb70 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -26,8 +26,8 @@
 #include "command.h"
 #include "ncu.h"
 #include "screen.h"
-#include "screen_utils.h"
 #include "screen_status.h"
+#include "xterm_title.h"
 #include "strfsong.h"
 #include "i18n.h"
 #include "player_command.h"
@@ -75,15 +75,19 @@ update_xterm_title(void)
        const struct mpd_song *song = mpd->song;
 
        char tmp[BUFSIZE];
+       const char *new_title = NULL;
        if (options.xterm_title_format && mpd->playing && song)
-               strfsong(tmp, BUFSIZE, options.xterm_title_format, song);
-       else
-               g_strlcpy(tmp, PACKAGE " version " VERSION, BUFSIZE);
+               new_title = strfsong(tmp, BUFSIZE, options.xterm_title_format, song) > 0
+                       ? tmp
+                       : NULL;
+
+       if (new_title == NULL)
+               new_title = PACKAGE " version " VERSION;
 
        static char title[BUFSIZE];
-       if (strncmp(title, tmp, BUFSIZE)) {
-               g_strlcpy(title, tmp, BUFSIZE);
-               set_xterm_title("%s", title);
+       if (strncmp(title, new_title, BUFSIZE)) {
+               g_strlcpy(title, new_title, BUFSIZE);
+               set_xterm_title(title);
        }
 }
 #endif
@@ -114,11 +118,7 @@ disable_update_timer(void)
 static bool
 should_enable_update_timer(void)
 {
-       return mpd->playing
-#ifndef NCMPC_MINI
-               || options.display_time
-#endif
-               ;
+       return mpd->playing;
 }
 
 static void
@@ -218,8 +218,8 @@ mpdclient_connected_callback(void)
                doupdate();
 
                /* try again after 30 seconds */
-               reconnect_source_id = g_timeout_add(30000,
-                                                   timer_reconnect, NULL);
+               reconnect_source_id =
+                       g_timeout_add_seconds(30, timer_reconnect, NULL);
                return;
        }
 #endif
@@ -241,8 +241,7 @@ mpdclient_failed_callback(void)
        assert(reconnect_source_id == 0);
 
        /* try again in 5 seconds */
-       reconnect_source_id = g_timeout_add(5000,
-                                           timer_reconnect, NULL);
+       reconnect_source_id = g_timeout_add_seconds(5, timer_reconnect, NULL);
 }
 
 void
@@ -252,7 +251,7 @@ mpdclient_lost_callback(void)
 
        screen_update(mpd);
 
-       reconnect_source_id = g_timeout_add(1000, timer_reconnect, NULL);
+       reconnect_source_id = g_timeout_add_seconds(1, timer_reconnect, NULL);
 }
 
 /**
@@ -427,7 +426,8 @@ main(int argc, const char *argv[])
        auto_update_timer();
 
 #ifndef NCMPC_MINI
-       check_key_bindings_source_id = g_timeout_add(10000, timer_check_key_bindings, NULL);
+       check_key_bindings_source_id =
+               g_timeout_add_seconds(10, timer_check_key_bindings, NULL);
 #endif
 
        screen_paint(mpd);