From 602d92d8b28b72fe64e365c2f999c624ce92cb15 Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Sat, 10 Nov 2007 10:17:54 +0100
Subject: [PATCH] move statusbar_default_position in Statusbar struct

---
 config.c    | 8 ++++----
 config.h    | 4 ++--
 statusbar.c | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/config.c b/config.c
index f07e485ce..c608cc699 100644
--- a/config.c
+++ b/config.c
@@ -319,13 +319,13 @@ parse_config(const char *confpatharg, awesome_config *awesomeconf)
     tmp = cfg_getstr(cfg_statusbar, "position");
 
     if(tmp && !a_strncmp(tmp, "off", 6))
-        awesomeconf->statusbar_default_position = BarOff;
+        awesomeconf->statusbar.dposition = BarOff;
     else if(tmp && !a_strncmp(tmp, "bottom", 6))
-        awesomeconf->statusbar_default_position = BarBot;
+        awesomeconf->statusbar.dposition = BarBot;
     else
-        awesomeconf->statusbar_default_position = BarTop;
+        awesomeconf->statusbar.dposition = BarTop;
 
-    awesomeconf->statusbar.position = awesomeconf->statusbar_default_position;
+    awesomeconf->statusbar.position = awesomeconf->statusbar.dposition;
 
     /* Layouts */
 
diff --git a/config.h b/config.h
index 7cc093ade..9223c07c4 100644
--- a/config.h
+++ b/config.h
@@ -70,6 +70,8 @@ typedef struct
     int height;
     /** Layout txt width */
     int txtlayoutwidth;
+    /** Default position */
+    int dposition;
     /** Bar position */
     int position;
     /** Window */
@@ -172,8 +174,6 @@ struct awesome_config
     KeySym modkey;
     /** Numlock mask */
     unsigned int numlockmask;
-    /** Default status bar position */
-    int statusbar_default_position;
     /** Border size */
     int borderpx;
     /** Master width factor */
diff --git a/statusbar.c b/statusbar.c
index 4826d552c..a0123ee19 100644
--- a/statusbar.c
+++ b/statusbar.c
@@ -230,7 +230,7 @@ uicb_togglebar(awesome_config *awesomeconf,
                const char *arg __attribute__ ((unused)))
 {
     if(awesomeconf->statusbar.position == BarOff)
-        awesomeconf->statusbar.position = (awesomeconf->statusbar_default_position == BarOff) ? BarTop : awesomeconf->statusbar_default_position;
+        awesomeconf->statusbar.position = (awesomeconf->statusbar.dposition == BarOff) ? BarTop : awesomeconf->statusbar.dposition;
     else
         awesomeconf->statusbar.position = BarOff;
     updatebarpos(awesomeconf->display, awesomeconf->statusbar);