Build fixes for GCC 4.1

[disorder] / disobedience / added.c

diff --git a/disobedience/added.c b/disobedience/added.c
index e3c41c2e9b022907ff9b1849e65ea8a9294e708d..ce747c49a9a016a2426fb95dd0862a6d24f6be90 100644 (file)
--- a/disobedience/added.c
+++ b/disobedience/added.c
@@ -28,10 +28,10 @@
  * with a valid and unique @c id field.  This function fakes it.
  */
 static void added_completed(void attribute((unused)) *v,
-                            const char *error,
+                            const char *err,
                             int nvec, char **vec) {
-  if(error) {
-    popup_protocol_error(0, error);
+  if(err) {
+    popup_protocol_error(0, err);
     return;
   }
   /* Convert the vector result to a queue linked list */
@@ -66,7 +66,7 @@ static void added_changed(const char attribute((unused)) *event,
 
 /** @brief Called at startup */
 static void added_init(void) {
-  event_register("added-changed", added_changed, 0);
+  event_register("rescan-complete", added_changed, 0);
 }
 
 /** @brief Columns for the new tracks list */