From 7c533b8b40740b1fe58954a936a972f9b5cd19d7 Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Wed, 14 Nov 2007 18:16:43 +0100
Subject: [PATCH] rename screen uicb correctly

---
 awesomerc |  4 ++--
 config.c  |  6 +++---
 screen.c  | 12 ++++++------
 screen.h  |  7 ++++---
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/awesomerc b/awesomerc
index 999397b7f..34554abe5 100644
--- a/awesomerc
+++ b/awesomerc
@@ -242,13 +242,13 @@ keys
     {
         modkey = {"Mod4", "Control"}
         key = "j"
-        command = "focusnextscreen"
+        command = "screen_focusnext"
     }
     key
     {
         modkey = {"Mod4", "Control"}
         key = "k"
-        command = "focusprevscreen"
+        command = "screen_focusprev"
     }
     key
     {
diff --git a/config.c b/config.c
index 09a4d52b8..60ef3e745 100644
--- a/config.c
+++ b/config.c
@@ -92,9 +92,9 @@ const NameFuncLink UicbList[] = {
     {"tag_setnmaster", uicb_tag_setnmaster},
     {"tag_setncol", uicb_tag_setncol},
     /* screen.c */
-    {"focusnextscreen", uicb_focusnextscreen},
-    {"focusprevscreen", uicb_focusprevscreen},
-    {"movetoscreen", uicb_movetoscreen},
+    {"screen_focusnext", uicb_screen_focusnext},
+    {"screen_focusprev", uicb_screen_focusprev},
+    {"client_movetoscreen", uicb_client_movetoscreen},
     /* awesome.c */
     {"quit", uicb_quit},
     /* statusbar.c */
diff --git a/screen.c b/screen.c
index b3ab58ee1..f50841176 100644
--- a/screen.c
+++ b/screen.c
@@ -216,8 +216,8 @@ move_mouse_pointer_to_screen(Display *disp, int screen)
 }
 
 void
-uicb_focusnextscreen(awesome_config * awesomeconf,
-                     const char *arg __attribute__ ((unused)))
+uicb_screen_focusnext(awesome_config * awesomeconf,
+                      const char *arg __attribute__ ((unused)))
 {
     Client *c;
     int next_screen = awesomeconf->screen + 1 >= get_screen_count(awesomeconf->display) ? 0 : awesomeconf->screen + 1;
@@ -232,8 +232,8 @@ uicb_focusnextscreen(awesome_config * awesomeconf,
 }
 
 void
-uicb_focusprevscreen(awesome_config * awesomeconf,
-                     const char *arg __attribute__ ((unused)))
+uicb_screen_focusprev(awesome_config * awesomeconf,
+                      const char *arg __attribute__ ((unused)))
 {
     Client *c;
     int prev_screen = awesomeconf->screen - 1 < 0 ? get_screen_count(awesomeconf->display) - 1 : awesomeconf->screen - 1;
@@ -253,8 +253,8 @@ uicb_focusprevscreen(awesome_config * awesomeconf,
  * \ingroup ui_callback
  */
 void
-uicb_movetoscreen(awesome_config * awesomeconf,
-                  const char *arg)
+uicb_client_movetoscreen(awesome_config * awesomeconf,
+                         const char *arg)
 {
     int new_screen, prev_screen;
     Client *sel = get_current_tag(awesomeconf->tags, awesomeconf->ntags)->client_sel;
diff --git a/screen.h b/screen.h
index 8eea698ca..8cb591413 100644
--- a/screen.h
+++ b/screen.h
@@ -34,9 +34,10 @@ int get_screen_bycoord(Display *, int, int);
 int get_screen_count(Display *);
 int get_phys_screen(Display *, int);
 void move_client_to_screen(Client *, awesome_config *, Bool);
-UICB_PROTO(uicb_focusnextscreen);
-UICB_PROTO(uicb_focusprevscreen);
-UICB_PROTO(uicb_movetoscreen);
+
+UICB_PROTO(uicb_screen_focusnext);
+UICB_PROTO(uicb_screen_focusprev);
+UICB_PROTO(uicb_client_movetoscreen);
 
 #endif
 // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99