Merge the Disobedience rewrite.

[disorder] / disobedience / recent.c

diff --git a/disobedience/recent.c b/disobedience/recent.c
index 49333e7109b59af59d0db5de88638f7345ec8071..109ee5ab3579daf95e5e0fda498e13aa959d849a 100644 (file)
--- a/disobedience/recent.c
+++ b/disobedience/recent.c
@@ -23,10 +23,10 @@
 
 /** @brief Update the recently played list */
 static void recent_completed(void attribute((unused)) *v,
-                             const char *error,
+                             const char *err,
                              struct queue_entry *q) {
-  if(error) {
-    popup_protocol_error(0, error);
+  if(err) {
+    popup_protocol_error(0, err);
     return;
   }
   /* The recent list is backwards compared to what we wanted */