mpdclient: automatically re-enter idle mode, eliminate mpdclient_put_connection()

[ncmpc.git] / src / screen_find.c

diff --git a/src/screen_find.c b/src/screen_find.c
index 5f2277288bacd4905ca4b4c13f9f30b1d49a70c8..06365b50e53c5bdbd9cad2aea37ab7db9922ef3f 100644 (file)
--- a/src/screen_find.c
+++ b/src/screen_find.c
@@ -1,5 +1,5 @@
 /* ncmpc (Ncurses MPD Client)
- * (c) 2004-2010 The Music Player Daemon Project
+ * (c) 2004-2017 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -49,8 +49,8 @@ screen_find(struct list_window *lw, command_t findcmd,
                if (screen.findbuf) {
                        g_free(screen.findbuf);
                        screen.findbuf=NULL;
-               }
-               /* continue... */
+       }
+               /* fall through */
 
        case CMD_LIST_FIND_NEXT:
        case CMD_LIST_RFIND_NEXT:
@@ -93,9 +93,8 @@ screen_find(struct list_window *lw, command_t findcmd,
  * which begins with this string while the users types */
 void
 screen_jump(struct list_window *lw,
-               list_window_callback_fn_t callback_fn,
-           list_window_paint_callback_t paint_callback,
-               void *callback_data)
+           list_window_callback_fn_t callback_fn, void *callback_data,
+           list_window_paint_callback_t paint_callback, void *paint_data)
 {
        const int WRLN_MAX_LINE_SIZE = 1024;
        int key = 65;
@@ -134,7 +133,7 @@ screen_jump(struct list_window *lw,
 
                /* repaint the list_window */
                if (paint_callback != NULL)
-                       list_window_paint2(lw, paint_callback, callback_data);
+                       list_window_paint2(lw, paint_callback, paint_data);
                else
                        list_window_paint(lw, callback_fn, callback_data);
                wrefresh(lw->w);