require libmpdclient 2.9, remove several #ifdefs

[ncmpc.git] / src / screen_chat.c

diff --git a/src/screen_chat.c b/src/screen_chat.c
index 2b887bafbe3a6208cd2758e4521bd60fbe93eb89..b4c80fbce14c1432042a5519325444ba0fa8a94d 100644 (file)
--- a/src/screen_chat.c
+++ b/src/screen_chat.c
@@ -106,14 +106,12 @@ screen_chat_paint(void)
 static void
 process_message(struct mpd_message *message)
 {
-       char *message_text;
-
        assert(message != NULL);
        /* You'll have to move this out of screen_chat, if you want to use
           client-to-client messages anywhere else */
        assert(g_strcmp0(mpd_message_get_channel(message), chat_channel) == 0);
 
-       message_text = utf8_to_locale(mpd_message_get_text(message));
+       char *message_text = utf8_to_locale(mpd_message_get_text(message));
        screen_text_append(&text, message_text);
        g_free(message_text);
 
@@ -196,7 +194,7 @@ screen_chat_cmd(struct mpdclient *c, command_t cmd)
 }
 
 static const char *
-screen_chat_title(G_GNUC_UNUSED char *s, G_GNUC_UNUSED size_t size)
+screen_chat_title(gcc_unused char *s, gcc_unused size_t size)
 {
        return _("Chat");
 }