X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fmain.c;h=a5a803f04104163562c514ffa88e9ab7281e2d44;hb=aab54ebefbbb5e81e8feca6dfd08ea463df88e7c;hp=b67165f144f9eec225a338285ed9c96dcafe6cfd;hpb=13e870230c604adf01e6f409a53231febe14d2c0;p=ncmpc.git

diff --git a/src/main.c b/src/main.c
index b67165f..a5a803f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -75,14 +75,18 @@ 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);
+	if (strncmp(title, new_title, BUFSIZE)) {
+		g_strlcpy(title, new_title, BUFSIZE);
 		set_xterm_title(title);
 	}
 }
@@ -214,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
@@ -237,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
@@ -248,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);
 }
 
 /**
@@ -423,10 +426,11 @@ 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);
+	screen_paint(mpd, true);
 
 	g_main_loop_run(main_loop);
 	g_main_loop_unref(main_loop);