Merge remote branches 'jn/cosmetics', 'jn/doxygen' and 'jn/renames'

diff --combined Makefile.am
index dce18a5473faf701c119a1fb61292c84e83eb9b3,dce18a5473faf701c119a1fb61292c84e83eb9b3,52177c81124fb736a83555ebee23b23ae693f93a,b4207cdf29489e64d32aff31a89aeec63a9f6809..a6ca4f2e140404ff821406e5cf41640d38aea783
--- 1/Makefile.am
--- 2/Makefile.am
--- 3/Makefile.am
--- 4/Makefile.am
+++ b/Makefile.am
@@@@@ -30,7 -30,7 -30,7 -30,7 +30,7 @@@@@ ncmpc_headers = 
        src/progress_bar.h \
        src/status_bar.h \
        src/screen.h \
---     src/screen_message.h \
+++     src/screen_status.h \
        src/screen_interface.h \
        src/screen_list.h \
        src/screen_find.h \
@@@@@ -90,7 -90,7 -90,7 -90,7 +90,7 @@@@@ src_ncmpc_SOURCES = 
        src/progress_bar.c \
        src/status_bar.c \
        src/screen.c \
---     src/screen_message.c \
+++     src/screen_status.c \
        src/screen_list.c \
        src/screen_find.c \
        src/screen_utils.c \
@@@@@ -209,10 -209,10 -209,32 -209,10 +209,32 @@@@@ doc_DATA = 
        AUTHORS NEWS README
    man_MANS = doc/ncmpc.1
    
++ +if ENABLE_DOCUMENTATION
++ +doc/api/html/index.html: doc/doxygen.conf
++ +    @mkdir -p $(@D)
++ +    $(DOXYGEN) $<
++ +
++ +all-local: doc/api/html/index.html
++ +
++ +clean-local:
++ +    rm -rf doc/api
++ +
++ +# copied from MPD, disabled  --jn
++ +#---------------------------------------
++ +#install-data-local: doc/api/html/index.html
++ +#   $(mkinstalldirs) $(DESTDIR)$(docdir)/api/html
++ +#   $(INSTALL_DATA) -c -m 644 doc/api/html/*.* \
++ +#           $(DESTDIR)$(docdir)/api/html
++ +#
++ +#uninstall-local:
++ +#   rm -f $(DESTDIR)$(docdir)/api/html/*.*
++ +#---------------------------------------
++ +endif
++ +
    #
    # Distribution
    #
    
    EXTRA_DIST = autogen.sh \
        $(lyrics_plugins) \
-- -    $(man_MANS) $(doc_DATA)
++ +    $(man_MANS) $(doc_DATA) doc/doxygen.conf

diff --combined configure.ac
index ff43e671ef1578350531850844ae22a6b865b079,22875e4ca1243697dce9b3791f13729a8ed57a57,3eb338447990854612bbe9912614bc11cafbec7f,ff43e671ef1578350531850844ae22a6b865b079..19b8ba10a8ccc7d215030dfab4124f3c60981c4e
--- 1/configure.ac
--- 2/configure.ac
--- 3/configure.ac
--- 4/configure.ac
+++ b/configure.ac
@@@@@ -31,7 -31,7 -31,7 -31,7 +31,7 @@@@@ dn
    
    AC_ARG_ENABLE(mini,
        AS_HELP_STRING([--enable-mini],
- --            [Build ncmpc-mini, i.e. without all optional features (default: disabled)]),,
+ ++            [Build ncmpc-mini, i.e. without all optional features @<:@default=no@:>@]),,
        [enable_mini=no])
    
    AM_CONDITIONAL(NCMPC_MINI, test x$enable_mini = xyes)
@@@@@ -71,7 -71,7 -71,7 -71,7 +71,7 @@@@@ dnl multi-byte character suppor
    
    AC_ARG_ENABLE([multibyte],
        AS_HELP_STRING([--disable-multibyte],
- --            [Disable multibyte character support (default: enabled)]),,
+ ++            [Disable multibyte character support @<:@default=yes@:>@]),,
                [enable_multibyte=$disable_mini])
    
    if test x$enable_multibyte = xyes; then
@@@@@ -95,7 -95,7 -95,7 -95,7 +95,7 @@@@@ dnl i18
    
    AC_ARG_ENABLE([locale],
        AS_HELP_STRING([--disable-locale],
- --            [Disable locale support (default: auto)]),,
+ ++            [Disable locale support @<:@default=auto@:>@]),,
                [enable_locale=$auto_mini])
    
    if test x$enable_locale = xyes; then
@@@@@ -334,7 -334,7 -334,7 -334,7 +334,7 @@@@@ dn
    
    AC_ARG_ENABLE(werror,
        AS_HELP_STRING([--enable-werror],
- --            [Treat warnings as errors (default: disabled)]),,
+ ++            [Treat warnings as errors @<:@default=no@:>@]),,
        enable_werror=no)
    
    if test "x$enable_werror" = xyes; then
@@@@@ -343,7 -343,7 -343,7 -343,7 +343,7 @@@@@ f
    
    AC_ARG_ENABLE(debug,
        AS_HELP_STRING([--enable-debug],
- --            [Enable debugging (default: disabled)]),,
+ ++            [Enable debugging @<:@default=no@:>@]),,
        enable_debug=no)
    
    if test "x$enable_debug" = xno; then
@@@@@ -357,6 -357,6 -357,24 -357,6 +357,24 @@@@@ AC_ARG_ENABLE(test
    
    AM_CONDITIONAL(ENABLE_TEST, test "x$enable_test" = xyes)
    
++ +dnl
++ +dnl autogenerated documentation
++ +dnl
++ +
++ +AC_ARG_ENABLE(documentation,
++ +    AS_HELP_STRING([--enable-documentation],
++ +            [build doxygen documentation @<:@default=no@:>@]),,
++ +    enable_documentation=no)
++ +
++ +if test x$enable_documentation = xyes; then
++ +    AC_PATH_PROG(DOXYGEN, doxygen)
++ +    if test x$DOXYGEN = x; then
++ +            AC_MSG_ERROR([doxygen not found])
++ +    fi
++ +    AC_SUBST(DOXYGEN)
++ +fi
++ +
++ +AM_CONDITIONAL(ENABLE_DOCUMENTATION, test x$enable_documentation = xyes)
    
    dnl
    dnl CFLAGS
@@@@@ -380,4 -380,4 -398,4 -380,4 +398,4 @@@@@ dnl Generate output file
    dnl
    
    AC_CONFIG_FILES([Makefile po/Makefile.in po/Makefile])
-- -AC_OUTPUT
++ +AC_OUTPUT(doc/doxygen.conf)

diff --combined src/command.c
index 2b586174c415d8f83666692c389d72ec4f13c793,18d3ced9c47f2d7c662def0b50904f1a95cb46e5,68b8d1e09dcea819d9c27a2619672eb501d37a1e,68b8d1e09dcea819d9c27a2619672eb501d37a1e..0e7e5a2551b2f348088a6875a60ac77b79fabf17
--- 1/src/command.c
--- 2/src/command.c
--- 3/src/command.c
--- 4/src/command.c
+++ b/src/command.c
@@@@@ -1,21 -1,21 -1,21 -1,21 +1,21 @@@@@
    /* 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 "command.h"
    #include "config.h"
@@@@@ -482,20 -482,23 -482,23 -482,23 +482,20 @@@@@ assign_keys(command_t command, int keys
    int
    check_key_bindings(command_definition_t *cp, char *buf, size_t bufsize)
    {
 ---    int i = 0;
 +++    int i;
        int retval = 0;
    
        if (cp == NULL)
                cp = cmds;
    
 ---    while (cp[i].name) {
 +++    for (i = 0; cp[i].name; i++)
                cp[i].flags &= ~COMMAND_KEY_CONFLICT;
 ---            i++;
 ---    }
    
 ---    i = 0;
 ---    while (cp[i].name) {
 +++    for (i = 0; cp[i].name; i++) {
                int j;
                command_t cmd;
    
 ---            for(j=0; j<MAX_COMMAND_KEYS; j++)
 +++            for(j=0; j<MAX_COMMAND_KEYS; j++) {
                        if (cp[i].keys[j] &&
                            (cmd = find_key_command(cp[i].keys[j],cp)) != cp[i].command) {
                                if (buf) {
@@@@@ -516,9 -519,8 -519,8 -519,8 +516,9 @@@@@
                                set_key_flags(cp, cmd, COMMAND_KEY_CONFLICT);
                                retval = -1;
                        }
 ---            i++;
 +++            }
        }
 +++
        return retval;
    }
    

diff --combined src/list_window.c
index 66c6d21361817ce61202d125be1564c085be707f,4cf2c1b9d61cf9f783ab853a66b9a685f067f991,66c6d21361817ce61202d125be1564c085be707f,1c143d3d7918dcf53e3ef0a4dc1a970d1d068dff..ad2ae77cc1f588b7e691d17b2079756f148dda62
--- 1/src/list_window.c
--- 2/src/list_window.c
--- 3/src/list_window.c
--- 4/src/list_window.c
+++ b/src/list_window.c
@@@@@ -1,21 -1,21 -1,21 -1,21 +1,21 @@@@@
    /* 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 "list_window.h"
    #include "config.h"
@@@@@ -25,7 -25,7 -25,7 -25,7 +25,7 @@@@@
    #include "command.h"
    #include "colors.h"
    #include "paint.h"
--- #include "screen_message.h"
+++ #include "screen_status.h"
    #include "i18n.h"
    
    #include <assert.h>

diff --combined src/main.c
index 1e7caeea8444a346c003466851c80ab3f254c5fa,511ebaaebdb1a0367e6321e2f3c242e27af86bb7,389b8c68e570f2c8eb52a22e0419a81cfa62f35d,60f5d21c92290b4193eae1e1c6fd649c2ebb2744..7e3e3df114055dabaa6087c172e6dbf462bc1010
--- 1/src/main.c
--- 2/src/main.c
--- 3/src/main.c
--- 4/src/main.c
+++ b/src/main.c
@@@@@ -15,7 -15,7 -15,7 -15,7 +15,7 @@@@@
     * 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 "ncmpc.h"
@@@@@ -27,7 -27,7 -27,7 -27,7 +27,7 @@@@@
    #include "ncu.h"
    #include "screen.h"
    #include "screen_utils.h"
--- #include "screen_message.h"
+++ #include "screen_status.h"
    #include "strfsong.h"
    #include "i18n.h"
    #include "player_command.h"
@@@@@ -271,12 -271,7 -271,7 -271,7 +271,12 @@@@@ default_settings_name(void
    
        return name;
    #else
 ---    return g_strdup(options.host);
 +++    /*
 +++     * localhost is actually not correct, we only know that
 +++     * mpd_connection_new() has connected to the "default host".
 +++     */
 +++    const char *name = options.host ?: "localhost";
 +++    return g_strdup(name);
    #endif
    }
    
@@@@@ -293,7 -288,12 -288,12 -288,12 +293,7 @@@@@ connection_settings_name(const struct m
    #else
        (void)connection;
    
 ---    /*
 ---     * localhost is actually not correct, we only know that
 ---     * mpd_connection_new() has connected to the "default host".
 ---     */
 ---    const char *name = options.host ?: "localhost";
 ---    return g_strdup(name);
 +++    return default_settings_name();
    #endif
    }
    

diff --combined src/mpdclient.c
index ce1eed5972de92bda9ef4db76a0aa7682d60dc92,f4fecae0ca9d3036d6b3fd1c7b4cc85b4b302a8d,34d26df69e30a81965f3df091af98aad267a48cc,34d26df69e30a81965f3df091af98aad267a48cc..ec058061546c23cf1033076d220b267745ff2949
--- 1/src/mpdclient.c
--- 2/src/mpdclient.c
--- 3/src/mpdclient.c
--- 4/src/mpdclient.c
+++ b/src/mpdclient.c
@@@@@ -1,21 -1,21 -1,21 -1,21 +1,21 @@@@@
    /* 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 "mpdclient.h"
    #include "filelist.h"
@@@@@ -83,6 -83,13 -83,13 -83,13 +83,6 @@@@@ mpdclient_handle_error(struct mpdclien
        return false;
    }
    
 ---static bool
 ---mpdclient_finish_command(struct mpdclient *c)
 ---{
 ---    return mpd_response_finish(c->connection)
 ---            ? true : mpdclient_handle_error(c);
 ---}
 ---
    struct mpdclient *
    mpdclient_new(void)
    {

diff --combined src/ncmpc.h
index 56dee646b5b14e091cb28efc112990d2f82736b7,287443f73457a0355934f47f40eaee677242e0d8,5f57611f76cb888fac5bb2a5ad877314d11da5bc,5f57611f76cb888fac5bb2a5ad877314d11da5bc..0b6441850a4972f14cf9921b726ab7868947af1b
--- 1/src/ncmpc.h
--- 2/src/ncmpc.h
--- 3/src/ncmpc.h
--- 4/src/ncmpc.h
+++ b/src/ncmpc.h
@@@@@ -1,28 -1,27 -1,27 -1,27 +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.
- --*/
+ ++ */
    
    #ifndef NCMPC_H
    #define NCMPC_H
    
    #include "command.h"
    
 +++/** put the terminal in a sane mode and stop/suspend ncmpc */
    void
    sigstop(void);
    

diff --combined src/player_command.c
index 2455c83e58cdb74b5645730c0a91590c5c0e073b,3161792dc1ff7f9d265f3509318395af263a081d,2455c83e58cdb74b5645730c0a91590c5c0e073b,59c97253fee813e78fcda2d718b775428b775de7..f38147a7c7c7985c3c5c5aee6cbe37209219fbfd
--- 1/src/player_command.c
--- 2/src/player_command.c
--- 3/src/player_command.c
--- 4/src/player_command.c
+++ b/src/player_command.c
@@@@@ -1,17 -1,17 -1,17 -1,17 +1,17 @@@@@
    /* 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.
@@@@@ -22,7 -22,7 -22,7 -22,7 +22,7 @@@@@
    #include "options.h"
    #include "i18n.h"
    #include "screen_client.h"
--- #include "screen_message.h"
+++ #include "screen_status.h"
    
    int seek_id = -1;
    int seek_target_time;

diff --combined src/screen.c
index fdc168adb5efc3869e65425e6579a3d6d8cd4c8a,dd87c125e5cc6611a2b1477d5e5243ac214be99c,fdc168adb5efc3869e65425e6579a3d6d8cd4c8a,b341a8a65ffdb9cb75b6f3ac79fd140eecea7cb4..c34d3962e35b4afb20f48f62e9fa66b34c7d3d2e
--- 1/src/screen.c
--- 2/src/screen.c
--- 3/src/screen.c
--- 4/src/screen.c
+++ b/src/screen.c
@@@@@ -1,27 -1,27 -1,27 -1,27 +1,27 @@@@@
    /* 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 "screen.h"
    #include "screen_interface.h"
    #include "screen_list.h"
    #include "screen_utils.h"
--- #include "screen_message.h"
+++ #include "screen_status.h"
    #include "config.h"
    #include "i18n.h"
    #include "charset.h"

diff --combined src/screen_artist.c
index 0b460a186cde08b68434749061f53d9e8321b624,245637806b9d27c5ec9d0ef2ac90b19f78390a0e,3ae214545ff3b1766f3859529be494c5ae60f6bc,2b6448e6398fd513948489fbdce71e2a0a44cd38..d488a7b9cb5a0090c280fefbfb34a749c3f9b304
--- 1/src/screen_artist.c
--- 2/src/screen_artist.c
--- 3/src/screen_artist.c
--- 4/src/screen_artist.c
+++ b/src/screen_artist.c
@@@@@ -1,25 -1,25 -1,25 -1,25 +1,25 @@@@@
    /* 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 "screen_artist.h"
    #include "screen_interface.h"
--- #include "screen_message.h"
+++ #include "screen_status.h"
    #include "screen_find.h"
    #include "screen_browser.h"
    #include "screen.h"
@@@@@ -162,7 -162,8 -162,8 -162,8 +162,7 @@@@@ load_artist_list(struct mpdclient *c
                mpd_search_commit(connection);
                recv_tag_values(connection, MPD_TAG_ARTIST, artist_list);
    
 ---            if (!mpd_response_finish(connection))
 ---                    mpdclient_handle_error(c);
 +++            mpdclient_finish_command(c);
        }
    
        /* sort list */
@@@@@ -192,7 -193,8 -193,8 -193,8 +192,7 @@@@@ load_album_list(struct mpdclient *c
    
                recv_tag_values(connection, MPD_TAG_ALBUM, album_list);
    
 ---            if (!mpd_response_finish(connection))
 ---                    mpdclient_handle_error(c);
 +++            mpdclient_finish_command(c);
        }
    
        /* sort list */
@@@@@ -226,7 -228,8 -228,8 -228,8 +226,7 @@@@@ load_song_list(struct mpdclient *c
    
                filelist_recv(browser.filelist, connection);
    
 ---            if (!mpd_response_finish(connection))
 ---                    mpdclient_handle_error(c);
 +++            mpdclient_finish_command(c);
        }
    
        /* fix highlights */
@@@@@ -478,8 -481,10 -481,10 -481,10 +478,8 @@@@@ add_query(struct mpdclient *c, enum mpd
    
        addlist = filelist_new_recv(connection);
    
 ---    if (mpd_response_finish(connection))
 +++    if (mpdclient_finish_command(c))
                mpdclient_filelist_add_all(c, addlist);
 ---    else
 ---            mpdclient_handle_error(c);
    
        filelist_free(addlist);
    }

diff --combined src/screen_browser.c
index 04673f4e85a7e5632525a3cf19820fcab1d80ad6,313f9da6688e31865becda4a5ce95d73c3df2e60,04673f4e85a7e5632525a3cf19820fcab1d80ad6,41783b5cc05520edabc940903cd8d6fb17e9e035..31c5b6525f68fca91068920679c42e56bb0aeebf
--- 1/src/screen_browser.c
--- 2/src/screen_browser.c
--- 3/src/screen_browser.c
--- 4/src/screen_browser.c
+++ b/src/screen_browser.c
@@@@@ -1,28 -1,28 -1,28 -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"

diff --combined src/screen_file.c
index 515937750980757325ab5aedeb6dd18dfd3e101c,eed3e68e23ddc5ca06a072f8e91f90431431d40a,73f56005f51f244ca26d4972c9441846931ddb36,46ffdc20f8dff9f593497b1c88bb42e160ea8f40..4eb8943d1810effaa6cb1ef1c33610acb631e2ce
--- 1/src/screen_file.c
--- 2/src/screen_file.c
--- 3/src/screen_file.c
--- 4/src/screen_file.c
+++ b/src/screen_file.c
@@@@@ -1,26 -1,26 -1,26 -1,26 +1,26 @@@@@
    /* 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 "screen_file.h"
    #include "screen_browser.h"
    #include "screen_interface.h"
--- #include "screen_message.h"
+++ #include "screen_status.h"
    #include "screen_queue.h"
    #include "screen.h"
    #include "config.h"
@@@@@ -63,8 -63,10 -63,10 -63,10 +63,8 @@@@@ screen_file_load_list(struct mpdclient 
        mpd_send_list_meta(connection, current_path);
        filelist_recv(filelist, connection);
    
 ---    if (mpd_response_finish(connection))
 +++    if (mpdclient_finish_command(c))
                filelist_sort_dir_play(filelist, compare_filelist_entry_path);
 ---    else
 ---            mpdclient_handle_error(c);
    }
    
    static void

diff --combined src/screen_keydef.c
index 8ecc003ac94cc0493a0c6daaef125dafc9cb5769,ba229ec87ab98ec4827ebc6fb4d149b37b9417f0,8ecc003ac94cc0493a0c6daaef125dafc9cb5769,cc3ccb5af9cba984acc042ea6511fc9af08ed2bd..6e19d8d2bb924cb62a38e89bd4f157cffb4415fd
--- 1/src/screen_keydef.c
--- 2/src/screen_keydef.c
--- 3/src/screen_keydef.c
--- 4/src/screen_keydef.c
+++ b/src/screen_keydef.c
@@@@@ -1,25 -1,25 -1,25 -1,25 +1,25 @@@@@
    /* 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 "screen_keydef.h"
    #include "screen_interface.h"
--- #include "screen_message.h"
+++ #include "screen_status.h"
    #include "screen_find.h"
    #include "i18n.h"
    #include "conf.h"

diff --combined src/screen_lyrics.c
index e655fc5f37c1fcb53e2ce79d62b9c4be3aa0bb67,3350d8f067cdd90c64951774270e7a3a134bbb7b,e655fc5f37c1fcb53e2ce79d62b9c4be3aa0bb67,5c04fe2db9e799c52c747d1d950cdf905f079f16..6de59d5ef073869bb109728e91d36cdd524f6987
--- 1/src/screen_lyrics.c
--- 2/src/screen_lyrics.c
--- 3/src/screen_lyrics.c
--- 4/src/screen_lyrics.c
+++ b/src/screen_lyrics.c
@@@@@ -1,25 -1,25 -1,25 -1,25 +1,25 @@@@@
    /* 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 "screen_lyrics.h"
    #include "screen_interface.h"
--- #include "screen_message.h"
+++ #include "screen_status.h"
    #include "screen_file.h"
    #include "screen_song.h"
    #include "i18n.h"

diff --combined src/screen_outputs.c
index e32a83b3fc3c9e454aea9d5c2590bca570978baa,c755d2a22f595deae1068808f7ee400a45e0ccb1,af0b2d35b96bbba812c4ce4da3037cc36e068ede,98c4d9cbe5db08d507e8085d6e6a299e6fb4d5e4..888aa34f1f9edcbb970564e173f746443e5809db
--- 1/src/screen_outputs.c
--- 2/src/screen_outputs.c
--- 3/src/screen_outputs.c
--- 4/src/screen_outputs.c
+++ b/src/screen_outputs.c
@@@@@ -1,25 -1,25 -1,25 -1,25 +1,25 @@@@@
    /* 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 "screen_outputs.h"
    #include "screen_interface.h"
--- #include "screen_message.h"
+++ #include "screen_status.h"
    #include "paint.h"
    #include "i18n.h"
    #include "list_window.h"
@@@@@ -130,7 -130,8 -130,8 -130,8 +130,7 @@@@@ fill_outputs_list(struct mpdclient *c
                g_ptr_array_add(mpd_outputs, output);
        }
    
 ---    if (!mpd_response_finish(connection))
 ---            mpdclient_handle_error(c);
 +++    mpdclient_finish_command(c);
    
        list_window_set_length(lw, mpd_outputs->len);
    }

diff --combined src/screen_search.c
index 86c2bb171a74df7d335908e4325878146e77b60c,b3216f9fd6db75e362cf248b47e7a10f235640e8,86c2bb171a74df7d335908e4325878146e77b60c,cff0b9da276e9b2314f74d5f38d6109c9587091a..5e9226e6cff234246638f1121bf1c15447ae2860
--- 1/src/screen_search.c
--- 2/src/screen_search.c
--- 3/src/screen_search.c
--- 4/src/screen_search.c
+++ b/src/screen_search.c
@@@@@ -1,25 -1,25 -1,25 -1,25 +1,25 @@@@@
    /* 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 "screen_search.h"
    #include "screen_interface.h"
--- #include "screen_message.h"
+++ #include "screen_status.h"
    #include "screen.h"
    #include "i18n.h"
    #include "options.h"

diff --combined src/screen_song.c
index bed952fc11cf19901948ce91d0345cfa82cc9b54,a66f3e1b7217e2d5e873eaf3b0d6c762ec273a22,e738fc2914f9eb4f57faec1220ea54e38ff9d82b,e738fc2914f9eb4f57faec1220ea54e38ff9d82b..22f52f4b4441233f33da4929006e2d762074a16d
--- 1/src/screen_song.c
--- 2/src/screen_song.c
--- 3/src/screen_song.c
--- 4/src/screen_song.c
+++ b/src/screen_song.c
@@@@@ -1,21 -1,21 -1,21 -1,21 +1,21 @@@@@
    /* 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 "screen_song.h"
    #include "screen_interface.h"
@@@@@ -36,7 -36,6 -36,6 -36,6 +36,7 @@@@@
    
    enum {
        LABEL_LENGTH = MPD_TAG_COUNT,
 +++    LABEL_PATH,
        LABEL_BITRATE,
    };
    
@@@@@ -52,7 -51,6 -51,6 -51,6 +52,7 @@@@@ static const char *const tag_labels[] 
        [MPD_TAG_DATE] = N_("Date"),
        [MPD_TAG_GENRE] = N_("Genre"),
        [MPD_TAG_COMMENT] = N_("Comment"),
 +++    [LABEL_PATH] = N_("Path"),
        [LABEL_BITRATE] = N_("Bitrate"),
    };
    
@@@@@ -310,11 -308,10 -308,10 -308,10 +310,11 @@@@@ screen_song_add_song(const struct mpd_s
        screen_song_append_tag(song, MPD_TAG_GENRE);
        screen_song_append_tag(song, MPD_TAG_COMMENT);
    
 ---    screen_song_append(_("Path"), mpd_song_get_uri(song),
 +++    screen_song_append(_(tag_labels[LABEL_PATH]), mpd_song_get_uri(song),
                           max_tag_label_width);
        if (mpdclient_is_playing(c) && c->song != NULL &&
 ---        strcmp(mpd_song_get_uri(c->song), mpd_song_get_uri(song)) == 0) {
 +++        strcmp(mpd_song_get_uri(c->song), mpd_song_get_uri(song)) == 0 &&
 +++        mpd_status_get_kbit_rate(c->status)) {
                char buf[16];
                g_snprintf(buf, sizeof(buf), _("%d kbps"),
                           mpd_status_get_kbit_rate(c->status));