aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWirt Wolff <wirtwolff@gmail.com>2009-10-20 11:20:10 +0200
committerWirt Wolff <wirtwolff@gmail.com>2009-10-20 11:20:10 +0200
commit8b467cca12bd0edd8316c44417a4eed8609e1063 (patch)
treefdbfe2769b41e6a2761649581930d5a1866a5c38
parent67d02962648cf2a0dcacada3130d5075e40ecd6e (diff)
downloadXMonadContrib-8b467cca12bd0edd8316c44417a4eed8609e1063.tar.gz
XMonadContrib-8b467cca12bd0edd8316c44417a4eed8609e1063.tar.xz
XMonadContrib-8b467cca12bd0edd8316c44417a4eed8609e1063.zip
C.Gnome combine with instead of replace Desktop startupHook
Ignore-this: 99af07c4d36a575570935a0421a0e241 Now that C.Desktop sets startupHook do both rather than only gnomeRegister. darcs-hash:20091020092010-18562-f041db8dc123dda4a4a70c2e5b8535757bea9d82.gz
-rw-r--r--XMonad/Config/Gnome.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/XMonad/Config/Gnome.hs b/XMonad/Config/Gnome.hs
index 43a481d..67c1537 100644
--- a/XMonad/Config/Gnome.hs
+++ b/XMonad/Config/Gnome.hs
@@ -40,7 +40,7 @@ import System.Environment (getEnvironment)
gnomeConfig = desktopConfig
{ terminal = "gnome-terminal"
, keys = \c -> gnomeKeys c `M.union` keys desktopConfig c
- , startupHook = gnomeRegister }
+ , startupHook = gnomeRegister >> startupHook desktopConfig }
gnomeKeys (XConfig {modMask = modm}) = M.fromList $
[ ((modm, xK_p), gnomeRun)
@@ -62,7 +62,7 @@ gnomeRun = withDisplay $ \dpy -> do
-- | Register xmonad with gnome. 'dbus-send' must be in the $PATH with which
-- xmonad is started.
---
+--
-- This action reduces a delay on startup only only if you have configured
-- gnome-session>=2.26: to start xmonad with a command as such:
--