twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-05-19 11:30:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

Resolve conflicts between Justin Bogner's C.Desktop patch and latest head.

Browse Source
This commit is contained in:
Daniel Schoepe 2009-10-22 11:58:49 +00:00
parent fc1da0d701
commit 9f16a427e6
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
XMonad/Config/Desktop.hs
View File

@ -167,9 +167,10 @@ import qualified Data.Map as M
-- --
desktopConfig = defaultConfig desktopConfig = defaultConfig
{ logHook = ewmhDesktopsLogHook { startupHook = ewmhDesktopsStartup >> setDefaultCursor xC_left_ptr
, layoutHook = desktopLayoutModifiers $ layoutHook defaultConfig , logHook = ewmhDesktopsLogHook
, manageHook = manageHook defaultConfig <+> manageDocks , layoutHook = desktopLayoutModifiers $ layoutHook defaultConfig
, manageHook = manageHook defaultConfig <+> manageDocks
, handleEventHook = ewmhDesktopsEventHook , handleEventHook = ewmhDesktopsEventHook
, keys = \c -> desktopKeys c `M.union` keys defaultConfig c } , keys = \c -> desktopKeys c `M.union` keys defaultConfig c }