Build fixes for GCC 4.1

[disorder] / disobedience / properties.c

diff --git a/disobedience/properties.c b/disobedience/properties.c
index 57ed65d007ddd782e16a485d97a542f91c7f10b7..8b461090999fd26934bd456917f33933a269593f 100644 (file)
--- a/disobedience/properties.c
+++ b/disobedience/properties.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder.
- * Copyright (C) 2006, 2007 Richard Kettlewell
+ * Copyright (C) 2006-2008 Richard Kettlewell
  *
  * 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
@@ -17,11 +17,14 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-
+/** @file disobedience/properties.c
+ * @brief Track properties editor
+ *
+ * TODO:
+ * - return and escape keys should work 
+ */
 #include "disobedience.h"
 
-/* Track properties -------------------------------------------------------- */
-
 struct prefdata;
 
 static void kickoff_namepart(struct prefdata *f);
@@ -341,9 +344,9 @@ static void set_namepart(struct prefdata *f, const char *value) {
 }
 
 /* Called when we've set a namepart */
-static void set_namepart_completed(void *v, const char *error) {
-  if(error)
-    popup_protocol_error(0, error);
+static void set_namepart_completed(void *v, const char *err) {
+  if(err)
+    popup_protocol_error(0, err);
   else {
     struct prefdata *f = v;
     
@@ -374,9 +377,9 @@ static void set_edited_string(struct prefdata *f, const char *value) {
 }
 
 static void set_string_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 set_string(struct prefdata *f, const char *value) {
@@ -438,8 +441,8 @@ static void prefdata_onerror(struct callbackdata *cbd,
 }
 
 /* Got the value of a pref */
-static void prefdata_completed(void *v, const char *error, const char *value) {
-  if(error) {
+static void prefdata_completed(void *v, const char *err, const char *value) {
+  if(err) {
   } else {
     struct callbackdata *cbd = v;