rename uicb_swap{prev,next} to uicb_client_swap{prev,next}

awesomerc

@@ -230,13 +230,13 @@ keys
     {
         modkey = {"Mod4", "Shift"}
         key = "j"
-        command = "swapnext"
+        command = "client_swapnext"
     }
     key
     {
         modkey = {"Mod4", "Shift"}
         key = "k"
-        command = "swapprev"
+        command = "client_swapprev"
     }
     key
     {

client.c

@@ -683,8 +683,8 @@ uicb_setborder(awesome_config *awesomeconf,
 }
 
 void
-uicb_swapnext(awesome_config *awesomeconf,
-              const char *arg __attribute__ ((unused)))
+uicb_client_swapnext(awesome_config *awesomeconf,
+                     const char *arg __attribute__ ((unused)))
 {
     Client *next, *sel = get_current_tag(awesomeconf->tags, awesomeconf->ntags)->client_sel;
 
@@ -702,8 +702,8 @@ uicb_swapnext(awesome_config *awesomeconf,
 }
 
 void
-uicb_swapprev(awesome_config *awesomeconf,
-              const char *arg __attribute__ ((unused)))
+uicb_client_swapprev(awesome_config *awesomeconf,
+                     const char *arg __attribute__ ((unused)))
 {
     Client *prev, *sel = get_current_tag(awesomeconf->tags, awesomeconf->ntags)->client_sel;
 

client.h

@@ -43,8 +43,8 @@ UICB_PROTO(uicb_client_kill);
 UICB_PROTO(uicb_client_moveresize);
 UICB_PROTO(uicb_client_settrans);
 UICB_PROTO(uicb_setborder);
-UICB_PROTO(uicb_swapnext);
-UICB_PROTO(uicb_swapprev);
+UICB_PROTO(uicb_client_swapnext);
+UICB_PROTO(uicb_client_swapprev);
 
 #endif
 // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99

config.c

@@ -68,8 +68,8 @@ const NameFuncLink UicbList[] = {
     {"client_moveresize", uicb_client_moveresize},
     {"client_settrans", uicb_client_settrans},
     {"setborder", uicb_setborder},
-    {"swapnext", uicb_swapnext},
-    {"swapprev", uicb_swapprev},
+    {"client_swapnext", uicb_client_swapnext},
+    {"client_swapprev", uicb_client_swapprev},
     /* tag.c */
     {"tag", uicb_tag},
     {"togglefloating", uicb_togglefloating},