aboutsummaryrefslogtreecommitdiffstats
path: root/XMonad/Hooks/DynamicBars.hs
diff options
context:
space:
mode:
authorAdam Vogt <vogt.adam@gmail.com>2012-11-09 02:23:16 +0100
committerAdam Vogt <vogt.adam@gmail.com>2012-11-09 02:23:16 +0100
commitfff5ddb53f4eda07c3cbd1caae236e5edd8ea4bc (patch)
tree9f158730016f24578b11960dee6a7dcb11961e38 /XMonad/Hooks/DynamicBars.hs
parentf1c0b28a5c40186f8723772a9e30d1107a4c884b (diff)
downloadXMonadContrib-fff5ddb53f4eda07c3cbd1caae236e5edd8ea4bc.tar.gz
XMonadContrib-fff5ddb53f4eda07c3cbd1caae236e5edd8ea4bc.tar.xz
XMonadContrib-fff5ddb53f4eda07c3cbd1caae236e5edd8ea4bc.zip
Rename variables "state" to avoid warnings about shadowing
Ignore-this: cd063d632412f758ca9fed6393521c8f XMonad core re-exports Control.Monad.State, which includes a function "state" if you happen to use mtl-2. Since there's a chance xmonad still works with mtl-1 avoid imports like: import XMonad hiding (state) darcs-hash:20121109012316-1499c-539514f4cd97ba8b18a8fbfd1a15333b46d962e1.gz
Diffstat (limited to 'XMonad/Hooks/DynamicBars.hs')
-rw-r--r--XMonad/Hooks/DynamicBars.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/XMonad/Hooks/DynamicBars.hs b/XMonad/Hooks/DynamicBars.hs
index d8c40fe..993aec5 100644
--- a/XMonad/Hooks/DynamicBars.hs
+++ b/XMonad/Hooks/DynamicBars.hs
@@ -112,11 +112,11 @@ multiPP focusPP unfocusPP = do
multiPP' :: (PP -> X String) -> PP -> PP -> [Handle] -> X ()
multiPP' dynlStr focusPP unfocusPP handles = do
- state <- get
+ st <- get
let pickPP :: WorkspaceId -> WriterT (Last XState) X String
pickPP ws = do
- let isFoc = (ws ==) . W.tag . W.workspace . W.current $ windowset state
- put state{ windowset = W.view ws $ windowset state }
+ let isFoc = (ws ==) . W.tag . W.workspace . W.current $ windowset st
+ put st{ windowset = W.view ws $ windowset st }
out <- lift $ dynlStr $ if isFoc then focusPP else unfocusPP
when isFoc $ get >>= tell . Last . Just
return out