From 0baf18c83a50c016620a2a3ce845e04499672f71 Mon Sep 17 00:00:00 2001
From: Daniel Schoepe <daniel.schoepe@gmail.com>
Date: Sat, 7 Nov 2009 11:36:19 +0100
Subject: Fixed conflict between X.U.ExtensibleState and X.C.Sjanssen

Ignore-this: 80f4bb218574d7c528af17473c6e4f66

darcs-hash:20091107103619-7f603-af5e7e87450ba2cd2b6cfad5394b08e4d99c6de1.gz
---
 XMonad/Config/Sjanssen.hs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'XMonad/Config/Sjanssen.hs')

diff --git a/XMonad/Config/Sjanssen.hs b/XMonad/Config/Sjanssen.hs
index be5a72b..a2676e2 100644
--- a/XMonad/Config/Sjanssen.hs
+++ b/XMonad/Config/Sjanssen.hs
@@ -20,16 +20,16 @@ import XMonad.Layout.TwoPane
 
 import qualified Data.Map as M
 
-sjanssenConfig = do
-    sp <- mkSpawner
-    return . ewmh $ defaultConfig
+sjanssenConfig =
+    ewmh $ defaultConfig
         { terminal = "exec urxvt"
         , workspaces = ["irc", "web"] ++ map show [3 .. 9 :: Int]
         , mouseBindings = \(XConfig {modMask = modm}) -> M.fromList $
                 [ ((modm, button1), (\w -> focus w >> mouseMoveWindow w))
                 , ((modm, button2), (\w -> focus w >> windows W.swapMaster))
                 , ((modm.|. shiftMask, button1), (\w -> focus w >> mouseResizeWindow w)) ]
-        , keys = \c -> mykeys sp c `M.union` keys defaultConfig c
+        , keys = \c -> mykeys c `M.union` keys defaultConfig c
+        , logHook = dynamicLogString sjanssenPP >>= xmonadPropLog
         , layoutHook  = modifiers layouts
         , manageHook  = composeAll [className =? x --> doShift w
                                     | (x, w) <- [ ("Firefox", "web")
-- 
cgit v1.2.3