diff options
| author | Daniel Schoepe <daniel.schoepe@gmail.com> | 2009-10-22 13:58:49 +0200 |
|---|---|---|
| committer | Daniel Schoepe <daniel.schoepe@gmail.com> | 2009-10-22 13:58:49 +0200 |
| commit | 0c9f1ac69bad6af19f3129ec50c4899bac5c149a (patch) | |
| tree | 8cf11bf32f18d69597992a15eeda89a1ccd0107f | |
| parent | 6684e84f50d60cea956704be91d8ad7e0975564a (diff) | |
| download | XMonadContrib-0c9f1ac69bad6af19f3129ec50c4899bac5c149a.tar.gz XMonadContrib-0c9f1ac69bad6af19f3129ec50c4899bac5c149a.tar.xz XMonadContrib-0c9f1ac69bad6af19f3129ec50c4899bac5c149a.zip | |
Resolve conflicts between Justin Bogner's C.Desktop patch and latest head.
Ignore-this: ba805e9889d6bda5ea873e3537b0111f
darcs-hash:20091022115849-7f603-c645c8a5aa256445d6caaa8c4bc308f885ee5fe5.gz
| -rw-r--r-- | XMonad/Config/Desktop.hs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/XMonad/Config/Desktop.hs b/XMonad/Config/Desktop.hs index bb4ae74..87943c8 100644 --- a/XMonad/Config/Desktop.hs +++ b/XMonad/Config/Desktop.hs @@ -167,9 +167,10 @@ import qualified Data.Map as M -- desktopConfig = defaultConfig - { logHook = ewmhDesktopsLogHook - , layoutHook = desktopLayoutModifiers $ layoutHook defaultConfig - , manageHook = manageHook defaultConfig <+> manageDocks + { startupHook = ewmhDesktopsStartup >> setDefaultCursor xC_left_ptr + , logHook = ewmhDesktopsLogHook + , layoutHook = desktopLayoutModifiers $ layoutHook defaultConfig + , manageHook = manageHook defaultConfig <+> manageDocks , handleEventHook = ewmhDesktopsEventHook , keys = \c -> desktopKeys c `M.union` keys defaultConfig c } |