twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-08-10 00:41:52 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rename variables "state" to avoid warnings about shadowing

Browse Source 
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)
This commit is contained in:
Adam Vogt
2012-11-09 01:23:16 +00:00
parent e776260133
commit 1716ffd9d0
6 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
XMonad/Hooks/DynamicBars.hs
View File

@@ -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