Build fixes for GCC 4.1

[disorder] / disobedience / control.c

diff --git a/disobedience/control.c b/disobedience/control.c
index 3ccd7c22c104b2a7d435de19e34ecf0886807948..50aaebe421f5e8ac8882bf1c08d0683e0956f315 100644 (file)
--- a/disobedience/control.c
+++ b/disobedience/control.c
@@ -391,9 +391,9 @@ static void icon_changed(const char attribute((unused)) *event,
 }
 
 static void icon_action_completed(void attribute((unused)) *v,
 }
 
 static void icon_action_completed(void attribute((unused)) *v,

-                                  const char *error) {
-  if(error)
-    popup_protocol_error(0, error);
+                                  const char *err) {
+  if(err)
+    popup_protocol_error(0, err);

 }
 
 static void clicked_icon(GtkButton attribute((unused)) *button,
 }
 
 static void clicked_icon(GtkButton attribute((unused)) *button,


@@ -420,11 +420,11 @@ static void toggled_menu(GtkCheckMenuItem attribute((unused)) *menuitem,
 
 /** @brief Called when a volume command completes */
 static void volume_completed(void attribute((unused)) *v,
 
 /** @brief Called when a volume command completes */
 static void volume_completed(void attribute((unused)) *v,

-                             const char *error,
+                             const char *err,

                              int attribute((unused)) l,
                              int attribute((unused)) r) {
                              int attribute((unused)) l,
                              int attribute((unused)) r) {

-  if(error)
-    popup_protocol_error(0, error);
+  if(err)
+    popup_protocol_error(0, err);

   /* We don't set the UI's notion of the volume here, it is set from the log
    * regardless of the reason it changed */
 }
   /* We don't set the UI's notion of the volume here, it is set from the log
    * regardless of the reason it changed */
 }