rename spawn to uicb_spawn and fix buggy proto

config.c

@@ -88,7 +88,7 @@ static const NameFuncLink LayoutsList[] =
 /** List of available UI bindable callbacks and functions */
 static const NameFuncLink KeyfuncList[] = {
     /* util.c */
-    {"spawn", spawn},
+    {"spawn", uicb_spawn},
     /* client.c */
     {"killclient", uicb_killclient},
     {"moveresize", uicb_moveresize},

util.c

@@ -42,7 +42,8 @@ eprint(const char *fmt, ...)
 }
 
 void
-spawn(Display * disp,
+uicb_spawn(Display * disp,
+      DC *drawcontext __attribute__ ((unused)),
       awesome_config * awesomeconf __attribute__ ((unused)),
       const char *arg)
 {

util.h

@@ -119,7 +119,7 @@ static inline char *a_strdup(const char *s)
 }
 
 void eprint(const char *, ...) __attribute__ ((noreturn)) __attribute__ ((format(printf, 1, 2)));
-void spawn(Display *, awesome_config *, const char *);
+void uicb_spawn(Display *, DC *, awesome_config *, const char *);
 Bool xgettextprop(Display *, Window, Atom, char *, unsigned int);
 
 #endif