configure.ac: require libmpdclient 2.3

[ncmpc.git] / src / screen_browser.c

diff --git a/src/screen_browser.c b/src/screen_browser.c
index 45e11ebcfb4ca679345152cb445822606848c3db..6c802f6e87aaa2a0654a0ce7b42c2d88d4598cdb 100644 (file)
--- a/src/screen_browser.c
+++ b/src/screen_browser.c
@@ -1,28 +1,28 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
-
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #include "config.h"
 #include "screen_browser.h"
 #include "screen_file.h"
 #include "screen_song.h"
 #include "screen_lyrics.h"
-#include "screen_message.h"
+#include "screen_status.h"
 #include "screen_find.h"
 #include "screen.h"
 #include "i18n.h"
@@ -143,6 +143,9 @@ static bool
 enqueue_and_play(struct mpdclient *c, struct filelist_entry *entry)
 {
        struct mpd_connection *connection = mpdclient_get_connection(c);
+       if (connection == NULL)
+               return false;
+
        const struct mpd_song *song = mpd_entity_get_song(entry->entity);
        int id;
 
@@ -166,7 +169,7 @@ enqueue_and_play(struct mpdclient *c, struct filelist_entry *entry)
                entry->flags |= HIGHLIGHT;
 #endif
                strfsong(buf, BUFSIZE, options.list_format, song);
-               screen_status_printf(_("Adding \'%s\' to playlist"), buf);
+               screen_status_printf(_("Adding \'%s\' to queue"), buf);
        }
 
        if (!mpd_run_play_id(connection, id)) {
@@ -246,7 +249,7 @@ browser_handle_enter(struct screen_browser *browser, struct mpdclient *c)
 
 static bool
 browser_select_entry(struct mpdclient *c, struct filelist_entry *entry,
-                    G_GNUC_UNUSED gboolean toggle)
+                    gcc_unused gboolean toggle)
 {
        assert(entry != NULL);
        assert(entry->entity != NULL);
@@ -261,7 +264,7 @@ browser_select_entry(struct mpdclient *c, struct filelist_entry *entry,
                if (mpdclient_cmd_add_path(c, mpd_directory_get_path(dir))) {
                        char *tmp = utf8_to_locale(mpd_directory_get_path(dir));
 
-                       screen_status_printf(_("Adding \'%s\' to playlist"), tmp);
+                       screen_status_printf(_("Adding \'%s\' to queue"), tmp);
                        g_free(tmp);
                }
 
@@ -286,7 +289,7 @@ browser_select_entry(struct mpdclient *c, struct filelist_entry *entry,
                        char buf[BUFSIZE];
 
                        strfsong(buf, BUFSIZE, options.list_format, song);
-                       screen_status_printf(_("Adding \'%s\' to playlist"), buf);
+                       screen_status_printf(_("Adding \'%s\' to queue"), buf);
                }
 #ifndef NCMPC_MINI
        } else {