Merge from Disobedience branch

[disorder] / disobedience / queue.c

diff --git a/disobedience/queue.c b/disobedience/queue.c
index 7dbe563cb4cb35153e0fc25aea5e7173f8dcce0f..d69b34dd3e444218af2ce0936c8b9b6b9886fe26 100644 (file)
--- a/disobedience/queue.c
+++ b/disobedience/queue.c
@@ -32,10 +32,10 @@ struct queue_entry *playing_track;
 time_t last_playing;
 
 static void queue_completed(void *v,
-                            const char *error,
+                            const char *err,
                             struct queue_entry *q);
 static void playing_completed(void *v,
-                              const char *error,
+                              const char *err,
                               struct queue_entry *q);
 
 /** @brief Called when either the actual queue or the playing track change */