use g_timeout_add_seconds() where appropriate

[ncmpc.git] / src / screen.c

diff --git a/src/screen.c b/src/screen.c
index 1646282ac053aa6046be5c88459ca751c8204c6b..781b68f22eb9e99c2d06b2590dce1990548041a6 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
@@ -219,16 +219,13 @@ screen_resize(struct mpdclient *c)
        screen.main_window.cols = screen.cols;
        screen.main_window.rows = screen.rows-4;
        wresize(screen.main_window.w, screen.main_window.rows, screen.cols);
-       wclear(screen.main_window.w);
 
        /* progress window */
        progress_bar_resize(&screen.progress_bar, screen.cols,
                            screen.rows - 2, 0);
-       progress_bar_paint(&screen.progress_bar);
 
        /* status window */
        status_bar_resize(&screen.status_bar, screen.cols, screen.rows - 1, 0);
-       status_bar_paint(&screen.status_bar, c->status, c->song);
 
        screen.buf_size = screen.cols;
        g_free(screen.buf);
@@ -250,9 +247,7 @@ welcome_timer_callback(gpointer data)
 {
        struct mpdclient *c = data;
 
-#ifndef NCMPC_MINI
        screen.welcome_source_id = 0;
-#endif
 
        paint_top_window(mode_fn->get_title != NULL
                         ? mode_fn->get_title(screen.buf, screen.buf_size)
@@ -282,8 +277,8 @@ screen_init(struct mpdclient *c)
 #ifndef NCMPC_MINI
        if (options.welcome_screen_list)
                screen.welcome_source_id =
-                       g_timeout_add(SCREEN_WELCOME_TIME * 1000,
-                                     welcome_timer_callback, c);
+                       g_timeout_add_seconds(SCREEN_WELCOME_TIME,
+                                             welcome_timer_callback, c);
 #endif
 
        /* create top window */
@@ -300,11 +295,9 @@ screen_init(struct mpdclient *c)
        /* create progress window */
        progress_bar_init(&screen.progress_bar, screen.cols,
                          screen.rows - 2, 0);
-       progress_bar_paint(&screen.progress_bar);
 
        /* create status window */
        status_bar_init(&screen.status_bar, screen.cols, screen.rows - 1, 0);
-       status_bar_paint(&screen.status_bar, c->status, c->song);
 
 #ifdef ENABLE_COLORS
        if (options.enable_colors) {