*: use Compiler.h macros instead of glib.h

[ncmpc.git] / src / screen_outputs.c

diff --git a/src/screen_outputs.c b/src/screen_outputs.c
index c755d2a22f595deae1068808f7ee400a45e0ccb1..5ec897dade076dfa2acbc01e6655fc797f2d7b25 100644 (file)
--- a/src/screen_outputs.c
+++ b/src/screen_outputs.c
@@ -19,7 +19,7 @@
 
 #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"
@@ -89,7 +89,7 @@ toggle_output(struct mpdclient *c, unsigned int output_index)
 }
 
 static void
-clear_output_element(gpointer data, G_GNUC_UNUSED gpointer user_data)
+clear_output_element(gpointer data, gcc_unused gpointer user_data)
 {
        mpd_output_free(data);
 }
@@ -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);
 }
@@ -171,15 +170,15 @@ outputs_close(void)
 }
 
 static const char *
-outputs_title(G_GNUC_UNUSED char *str, G_GNUC_UNUSED size_t size)
+outputs_title(gcc_unused char *str, gcc_unused size_t size)
 {
        return _("Outputs");
 }
 
 static void
 screen_outputs_paint_callback(WINDOW *w, unsigned i,
-                             G_GNUC_UNUSED unsigned y, unsigned width,
-                             bool selected, G_GNUC_UNUSED void *data)
+                             gcc_unused unsigned y, unsigned width,
+                             bool selected, gcc_unused void *data)
 {
        const struct mpd_output *output;