screen_utils: automatically append "[y/n]"

[ncmpc.git] / src / screen_file.c

diff --git a/src/screen_file.c b/src/screen_file.c
index af0dbd0049b5978f108fb57f6ba231b24053fc2c..2af1655d3b3eca3e89c425c831ce3d7182a77865 100644 (file)
--- a/src/screen_file.c
+++ b/src/screen_file.c
@@ -42,16 +42,6 @@
 static struct screen_browser browser;
 static char *current_path;
 
-static void
-screen_file_paint(void);
-
-static void
-screen_file_repaint(void)
-{
-       screen_file_paint();
-       wrefresh(browser.lw->w);
-}
-
 static void
 screen_file_load_list(struct mpdclient *c, struct filelist *filelist)
 {
@@ -220,7 +210,7 @@ handle_delete(struct mpdclient *c)
 
                const struct mpd_playlist *playlist = mpd_entity_get_playlist(entity);
                char *str = utf8_to_locale(g_basename(mpd_playlist_get_path(playlist)));
-               char *buf = g_strdup_printf(_("Delete playlist %s [%s/%s] ? "), str, YES, NO);
+               char *buf = g_strdup_printf(_("Delete playlist %s?"), str);
                g_free(str);
                bool delete = screen_get_yesno(buf, false);
                g_free(buf);
@@ -245,7 +235,7 @@ handle_delete(struct mpdclient *c)
 }
 
 static void
-screen_file_init(WINDOW *w, int cols, int rows)
+screen_file_init(WINDOW *w, unsigned cols, unsigned rows)
 {
        current_path = g_strdup("");
 
@@ -254,7 +244,7 @@ screen_file_init(WINDOW *w, int cols, int rows)
 }
 
 static void
-screen_file_resize(int cols, int rows)
+screen_file_resize(unsigned cols, unsigned rows)
 {
        list_window_resize(browser.lw, cols, rows);
 }
@@ -319,7 +309,7 @@ screen_file_update(struct mpdclient *c)
 #endif
                         )) {
                screen_browser_sync_highlights(browser.filelist, &c->playlist);
-               screen_file_repaint();
+               screen_file_paint();
        }
 }
 
@@ -329,7 +319,7 @@ screen_file_cmd(struct mpdclient *c, command_t cmd)
        switch(cmd) {
        case CMD_PLAY:
                if (screen_file_handle_enter(c)) {
-                       screen_file_repaint();
+                       screen_file_paint();
                        return true;
                }
 
@@ -337,11 +327,11 @@ screen_file_cmd(struct mpdclient *c, command_t cmd)
 
        case CMD_GO_ROOT_DIRECTORY:
                change_directory(c, "");
-               screen_file_repaint();
+               screen_file_paint();
                return true;
        case CMD_GO_PARENT_DIRECTORY:
                change_to_parent(c);
-               screen_file_repaint();
+               screen_file_paint();
                return true;
 
        case CMD_LOCATE:
@@ -353,7 +343,7 @@ screen_file_cmd(struct mpdclient *c, command_t cmd)
        case CMD_SCREEN_UPDATE:
                screen_file_reload(c);
                screen_browser_sync_highlights(browser.filelist, &c->playlist);
-               screen_file_repaint();
+               screen_file_paint();
                return false;
 
        default:
@@ -362,7 +352,7 @@ screen_file_cmd(struct mpdclient *c, command_t cmd)
 
        if (browser_cmd(&browser, c, cmd)) {
                if (screen_is_visible(&screen_browse))
-                       screen_file_repaint();
+                       screen_file_paint();
                return true;
        }
 
@@ -372,7 +362,7 @@ screen_file_cmd(struct mpdclient *c, command_t cmd)
        switch(cmd) {
        case CMD_DELETE:
                handle_delete(c);
-               screen_file_repaint();
+               screen_file_paint();
                break;
 
        case CMD_SAVE_PLAYLIST: