From f9f75629e1502e6d4d2092666f59b93e1bfb9c81 Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Sat, 15 Mar 2008 09:43:58 +0100
Subject: [PATCH] Rule for titlebar applies event if we restart; set default to
 auto, which means off

---
 client.c            | 6 +++---
 common/configopts.c | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client.c b/client.c
index d3255c8a6..1d1b36dde 100644
--- a/client.c
+++ b/client.c
@@ -392,14 +392,13 @@ client_manage(Window w, XWindowAttributes *wa, int screen)
 
             if(rule->opacity >= 0.0f)
                 window_settrans(c->win, rule->opacity);
-
-            if(rule->titlebar.position != Auto)
-                c->titlebar.position = rule->titlebar.position;
         }
         else
             move_client_to_screen(c, screen, True);
     }
 
+    if(rule && rule->titlebar.position != Auto)
+        c->titlebar.position = rule->titlebar.position;
 
     switch(c->titlebar.position)
     {
@@ -416,6 +415,7 @@ client_manage(Window w, XWindowAttributes *wa, int screen)
                                           0);
         break;
       default:
+        c->titlebar.position = Off;
         break;
     }
 
diff --git a/common/configopts.c b/common/configopts.c
index 912fe6e42..870da1da4 100644
--- a/common/configopts.c
+++ b/common/configopts.c
@@ -69,7 +69,7 @@ cfg_awesome_include(cfg_t *cfg, cfg_opt_t *opt,
 
 cfg_opt_t titlebar_opts[] =
 {
-    CFG_STR((char *) "position", (char *) "off", CFGF_NONE),
+    CFG_STR((char *) "position", (char *) "auto", CFGF_NONE),
     CFG_STR((char *) "icon", (char *) "left", CFGF_NONE),
     CFG_AWESOME_END()
 };