release v0.29

[ncmpc.git] / src / screen_client.c

diff --git a/src/screen_client.c b/src/screen_client.c
index 9e13ba00e3ebf9a092f8062aa7d2695c9390d2c9..c70257fe7020891658a4f727d65b74c7a5e267da 100644 (file)
--- a/src/screen_client.c
+++ b/src/screen_client.c
@@ -1,5 +1,5 @@
 /* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 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
@@ -18,78 +18,32 @@
  */
 
 #include "screen_client.h"
-#include "screen_utils.h"
-#include "screen_message.h"
+#include "screen_status.h"
 #include "mpdclient.h"
 #include "i18n.h"
 #include "charset.h"
 
-static bool
-_screen_auth(struct mpdclient *c, gint recursion)
-{
-       char *password;
-
-       mpd_connection_clear_error(c->connection);
-       if (recursion > 2)
-               return false;
-
-       password = screen_read_password(NULL);
-       if (password == NULL)
-               return false;
-
-       mpd_send_password(c->connection, password);
-       g_free(password);
-
-       mpd_response_finish(c->connection);
-       mpdclient_update(c);
-
-       if (mpd_connection_get_error(c->connection) == MPD_ERROR_SERVER &&
-           mpd_connection_get_server_error(c->connection) == MPD_SERVER_ERROR_PASSWORD)
-               return  _screen_auth(c, ++recursion);
-
-       return true;
-}
-
-bool
-screen_auth(struct mpdclient *c)
-{
-       return _screen_auth(c, 0);
-}
-
-void
-mpdclient_ui_error(const char *message_utf8)
-{
-       char *message_locale = utf8_to_locale(message_utf8);
-       screen_status_printf("%s", message_locale);
-       g_free(message_locale);
-
-       screen_bell();
-       doupdate();
-}
-
 void
 screen_database_update(struct mpdclient *c, const char *path)
 {
-       unsigned id;
-
        assert(c != NULL);
        assert(mpdclient_is_connected(c));
 
-       id = mpd_run_update(c->connection, path);
+       struct mpd_connection *connection = mpdclient_get_connection(c);
+       if (connection == NULL)
+               return;
+
+       unsigned id = mpd_run_update(connection, path);
        if (id == 0) {
-               if (mpd_connection_get_error(c->connection) == MPD_ERROR_SERVER &&
-                   mpd_connection_get_server_error(c->connection) == MPD_SERVER_ERROR_UPDATE_ALREADY &&
-                   mpd_connection_clear_error(c->connection))
+               if (mpd_connection_get_error(connection) == MPD_ERROR_SERVER &&
+                   mpd_connection_get_server_error(connection) == MPD_SERVER_ERROR_UPDATE_ALREADY &&
+                   mpd_connection_clear_error(connection))
                        screen_status_printf(_("Database update running..."));
                else
                        mpdclient_handle_error(c);
                return;
        }
 
-       /* set update_id to make sure the browse callback gets called
-          even if the update has finished before status is updated */
-       c->update_id = id;
-
        if (path != NULL && *path != 0) {
                char *path_locale = utf8_to_locale(path);
                screen_status_printf(_("Database update of %s started"), path);