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

[ncmpc.git] / src / plugin.c

diff --git a/src/plugin.c b/src/plugin.c
index d89e210b1bd3e7bf456817b4ac0557263491ee22..29e4ffcd1a47a39dca5ec89c7fac6c1a9ac4648a 100644 (file)
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -1,23 +1,24 @@
 /* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 The Music Player Daemon Project
+ * (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 "plugin.h"
+#include "Compiler.h"
 
 #include <assert.h>
 #include <stdlib.h>
@@ -82,7 +83,7 @@ register_plugin(struct plugin_list *list, char *path)
        return true;
 }
 
-static gint 
+static gint
 plugin_compare_func_alpha(gconstpointer plugin1, gconstpointer plugin2)
 {
        return strcmp(* (char * const *) plugin1, * (char * const *) plugin2);
@@ -168,13 +169,13 @@ plugin_eof(struct plugin_cycle *cycle, struct plugin_pipe *p)
        } else {
                /* success: invoke the callback */
                cycle->callback(cycle->pipe_stdout.data, true,
-                               cycle->callback_data);
+                               cycle->argv[0], cycle->callback_data);
        }
 }
 
 static gboolean
-plugin_data(G_GNUC_UNUSED GIOChannel *source,
-           G_GNUC_UNUSED GIOCondition condition, gpointer data)
+plugin_data(gcc_unused GIOChannel *source,
+           gcc_unused GIOCondition condition, gpointer data)
 {
        struct plugin_cycle *cycle = data;
        struct plugin_pipe *p = NULL;
@@ -217,7 +218,7 @@ plugin_delayed_fail(gpointer data)
        assert(cycle->pipe_stderr.fd < 0);
        assert(cycle->pid < 0);
 
-       cycle->callback(cycle->all_errors, false, cycle->callback_data);
+       cycle->callback(cycle->all_errors, false, NULL, cycle->callback_data);
 
        return FALSE;
 }