From 7190e4fa48a741bc9c9f5526a4158ca0a3ef156f Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Wed, 19 Dec 2007 14:46:44 +1100
Subject: [PATCH] Change awesome_config -> AwesomeConf.

All other struct definitions in the project follow this naming convention.
---
 awesome.c            | 2 +-
 client.c             | 2 +-
 config.c             | 2 +-
 config.h             | 4 ++--
 event.c              | 2 +-
 focus.c              | 2 +-
 layout.c             | 2 +-
 layouts/fibonacci.c  | 2 +-
 layouts/floating.c   | 2 +-
 layouts/max.c        | 2 +-
 layouts/tile.c       | 2 +-
 mouse.c              | 2 +-
 screen.c             | 2 +-
 statusbar.c          | 2 +-
 tag.c                | 2 +-
 uicb.c               | 4 ++--
 widget.c             | 2 +-
 widgets/focustitle.c | 2 +-
 widgets/layoutinfo.c | 2 +-
 widgets/taglist.c    | 2 +-
 widgets/textbox.c    | 2 +-
 window.c             | 2 +-
 xutil.c              | 2 +-
 23 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/awesome.c b/awesome.c
index 85f0ff913..1c4d5945a 100644
--- a/awesome.c
+++ b/awesome.c
@@ -52,7 +52,7 @@
 static int (*xerrorxlib) (Display *, XErrorEvent *);
 static Bool running = True;
 
-awesome_config globalconf;
+AwesomeConf globalconf;
 
 static inline void
 cleanup_buttons(Button *buttons)
diff --git a/client.c b/client.c
index 3b7ae149c..d572eeeab 100644
--- a/client.c
+++ b/client.c
@@ -36,7 +36,7 @@
 #include "layouts/floating.h"
 
 
-extern awesome_config globalconf;
+extern AwesomeConf globalconf;
 
 /** Load windows properties, restoring client's tag
  * and floating state before awesome was restarted if any
diff --git a/config.c b/config.c
index 8983fdfed..3fc6ce1db 100644
--- a/config.c
+++ b/config.c
@@ -36,7 +36,7 @@
 
 #define AWESOME_CONFIG_FILE ".awesomerc" 
 
-extern awesome_config globalconf;
+extern AwesomeConf globalconf;
 
 /** Link a name to a key symbol */
 typedef struct
diff --git a/config.h b/config.h
index 9dffcd652..2b326f086 100644
--- a/config.h
+++ b/config.h
@@ -49,7 +49,7 @@ struct Rule
     Rule *next;
 };
 
-typedef struct awesome_config awesome_config;
+typedef struct AwesomeConf AwesomeConf;
 
 typedef struct Layout Layout;
 struct Layout
@@ -232,7 +232,7 @@ struct Widget
 
 
 /** Main configuration structure */
-struct awesome_config
+struct AwesomeConf
 {
     /** Display ref */
     Display *display;
diff --git a/event.c b/event.c
index 7962a7110..5bfa5c809 100644
--- a/event.c
+++ b/event.c
@@ -38,7 +38,7 @@
 #include "layouts/floating.h"
 
 
-extern awesome_config globalconf;
+extern AwesomeConf globalconf;
 
 #define CLEANMASK(mask)		(mask & ~(globalconf.numlockmask | LockMask))
 
diff --git a/focus.c b/focus.c
index e5fd511dc..cd58593a6 100644
--- a/focus.c
+++ b/focus.c
@@ -24,7 +24,7 @@
 #include "layout.h"
 #include "focus.h" 
 
-extern awesome_config globalconf;
+extern AwesomeConf globalconf;
 
 static FocusList *
 focus_get_node_by_client(Client *c)
diff --git a/layout.c b/layout.c
index bbb7d21dd..d96389c4b 100644
--- a/layout.c
+++ b/layout.c
@@ -34,7 +34,7 @@
 #include "layouts/fibonacci.h"
 #include "layouts/floating.h"
 
-extern awesome_config globalconf;
+extern AwesomeConf globalconf;
 
 const NameFuncLink LayoutsList[] =
 {
diff --git a/layouts/fibonacci.c b/layouts/fibonacci.c
index abf807018..f5304d77d 100644
--- a/layouts/fibonacci.c
+++ b/layouts/fibonacci.c
@@ -24,7 +24,7 @@
 #include "util.h"
 #include "layouts/fibonacci.h"
 
-extern awesome_config globalconf;
+extern AwesomeConf globalconf;
 
 static void
 layout_fibonacci(int screen, int shape)
diff --git a/layouts/floating.c b/layouts/floating.c
index 8b5ef45ae..04bc2e3cf 100644
--- a/layouts/floating.c
+++ b/layouts/floating.c
@@ -22,7 +22,7 @@
 #include "tag.h"
 #include "layouts/floating.h"
 
-extern awesome_config globalconf;
+extern AwesomeConf globalconf;
 
 void
 layout_floating(int screen)
diff --git a/layouts/max.c b/layouts/max.c
index 514352149..95083b76c 100644
--- a/layouts/max.c
+++ b/layouts/max.c
@@ -24,7 +24,7 @@
 #include "util.h"
 #include "layouts/max.h"
 
-extern awesome_config globalconf;
+extern AwesomeConf globalconf;
 
 void
 layout_max(int screen)
diff --git a/layouts/tile.c b/layouts/tile.c
index 1a00e2ba4..e1e745a27 100644
--- a/layouts/tile.c
+++ b/layouts/tile.c
@@ -28,7 +28,7 @@
 #include "layout.h"
 #include "layouts/tile.h"
 
-extern awesome_config globalconf;
+extern AwesomeConf globalconf;
 
 void
 uicb_tag_setnmaster(int screen, char * arg)
diff --git a/mouse.c b/mouse.c
index 6560b1d2f..f6a8c6374 100644
--- a/mouse.c
+++ b/mouse.c
@@ -28,7 +28,7 @@
 #include "window.h"
 #include "layouts/floating.h"
 
-extern awesome_config globalconf;
+extern AwesomeConf globalconf;
 
 /** Move client with mouse
  * \param screen Screen ID
diff --git a/screen.c b/screen.c
index 82cd4c8de..f821f9d90 100644
--- a/screen.c
+++ b/screen.c
@@ -26,7 +26,7 @@
 #include "focus.h"
 #include "statusbar.h"
 
-extern awesome_config globalconf;
+extern AwesomeConf globalconf;
 
 /** Get screens info
  * \param screen Screen number
diff --git a/statusbar.c b/statusbar.c
index 4e22ff62a..32e3f3776 100644
--- a/statusbar.c
+++ b/statusbar.c
@@ -30,7 +30,7 @@
 #include "tag.h"
 #include "widget.h"
 
-extern awesome_config globalconf;
+extern AwesomeConf globalconf;
 
 void
 statusbar_draw(int screen)
diff --git a/tag.c b/tag.c
index 991e6beb9..e6b00fbf5 100644
--- a/tag.c
+++ b/tag.c
@@ -28,7 +28,7 @@
 #include "util.h"
 #include "rules.h"
 
-extern awesome_config globalconf;
+extern AwesomeConf globalconf;
 
 static void
 detach_tagclientlink(int screen, TagClientLink *tc)
diff --git a/uicb.c b/uicb.c
index 307636ea9..40e887c6a 100644
--- a/uicb.c
+++ b/uicb.c
@@ -32,7 +32,7 @@
 #include "focus.h"
 #include "layouts/tile.h"
 
-extern awesome_config globalconf;
+extern AwesomeConf globalconf;
 
 const NameFuncLink UicbList[] =
 {
@@ -86,7 +86,7 @@ const NameFuncLink UicbList[] =
 };
 
 static int
-run_uicb(char *cmd, awesome_config *awesomeconf __attribute ((unused)))
+run_uicb(char *cmd, AwesomeConf *awesomeconf __attribute ((unused)))
 {
     char *p;
     const char *arg;
diff --git a/widget.c b/widget.c
index aa685920d..98d996f10 100644
--- a/widget.c
+++ b/widget.c
@@ -3,7 +3,7 @@
 #include "widget.h"
 #include "statusbar.h"
 
-extern awesome_config globalconf;
+extern AwesomeConf globalconf;
 
 const NameFuncLink WidgetList[] =
 {
diff --git a/widgets/focustitle.c b/widgets/focustitle.c
index 43316d268..3c60ebc30 100644
--- a/widgets/focustitle.c
+++ b/widgets/focustitle.c
@@ -5,7 +5,7 @@
 #include "layout.h"
 #include "focus.h"
 
-extern awesome_config globalconf;
+extern AwesomeConf globalconf;
 
 static int
 focustitle_draw(Widget *widget, DrawCtx *ctx, int offset, int used)
diff --git a/widgets/layoutinfo.c b/widgets/layoutinfo.c
index 1bd8e2761..b3ab842ed 100644
--- a/widgets/layoutinfo.c
+++ b/widgets/layoutinfo.c
@@ -3,7 +3,7 @@
 #include "util.h"
 #include "layout.h"
 
-extern awesome_config globalconf;
+extern AwesomeConf globalconf;
 
 static int
 layoutinfo_draw(Widget *widget,
diff --git a/widgets/taglist.c b/widgets/taglist.c
index 636dd6067..18780ba15 100644
--- a/widgets/taglist.c
+++ b/widgets/taglist.c
@@ -4,7 +4,7 @@
 #include "widget.h"
 #include "tag.h"
 
-extern awesome_config globalconf;
+extern AwesomeConf globalconf;
 
 /** Check if at least one client is tagged with tag number t and is on screen
  * screen
diff --git a/widgets/textbox.c b/widgets/textbox.c
index 5714b6adf..c3b5aee37 100644
--- a/widgets/textbox.c
+++ b/widgets/textbox.c
@@ -3,7 +3,7 @@
 #include "widget.h"
 #include "xutil.h"
 
-extern awesome_config globalconf;
+extern AwesomeConf globalconf;
 
 
 typedef struct Data Data;
diff --git a/window.c b/window.c
index 85b39de09..ca82e4e29 100644
--- a/window.c
+++ b/window.c
@@ -25,7 +25,7 @@
 #include "window.h"
 #include "util.h"
 
-extern awesome_config globalconf;
+extern AwesomeConf globalconf;
 
 /** Set client WM_STATE property
  * \param disp Display ref
diff --git a/xutil.c b/xutil.c
index 9760e8346..4cefa8ffe 100644
--- a/xutil.c
+++ b/xutil.c
@@ -27,7 +27,7 @@
 #include "xutil.h"
 
 
-extern awesome_config globalconf;
+extern AwesomeConf globalconf;
 
 /** Execute another process, replacing the current instance of Awesome
  * \param screen Screen ID