summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSpencer Janssen <spencerjanssen@gmail.com>2009-12-16 02:17:00 +0100
committerSpencer Janssen <spencerjanssen@gmail.com>2009-12-16 02:17:00 +0100
commit99120a7f1012b5fa1fe4e9944fffb16686611ef5 (patch)
tree1c2e50ec11d8b3bee6e7c083bc053c7653f62105
parentade267ec57e40f929f3bf3e62680056adc78c298 (diff)
downloadmetatile-99120a7f1012b5fa1fe4e9944fffb16686611ef5.tar
metatile-99120a7f1012b5fa1fe4e9944fffb16686611ef5.zip
Update for X11 1.5.0.0
Ignore-this: 669c764c4c0ca516c8bdc1dfa35cd66 darcs-hash:20091216011700-25a6b-bfb30dfcc001e9b872402cd5adcb72af6fb65464
-rw-r--r--XMonad/Main.hsc2
-rw-r--r--xmonad.cabal2
2 files changed, 2 insertions, 2 deletions
diff --git a/XMonad/Main.hsc b/XMonad/Main.hsc
index e7fc768..d974a42 100644
--- a/XMonad/Main.hsc
+++ b/XMonad/Main.hsc
@@ -335,7 +335,7 @@ grabKeys = do
kc <- io $ keysymToKeycode dpy sym
-- "If the specified KeySym is not defined for any KeyCode,
-- XKeysymToKeycode() returns zero."
- when (kc /= '\0') $ mapM_ (grab kc . (mask .|.)) =<< extraModifiers
+ when (kc /= 0) $ mapM_ (grab kc . (mask .|.)) =<< extraModifiers
-- | XXX comment me
grabButtons :: X ()
diff --git a/xmonad.cabal b/xmonad.cabal
index 3213662..07f2f49 100644
--- a/xmonad.cabal
+++ b/xmonad.cabal
@@ -46,7 +46,7 @@ library
build-depends: base < 4 && >=3, containers, directory, process, filepath
else
build-depends: base < 3
- build-depends: X11>=1.4.6.1 && < 1.5, mtl, unix
+ build-depends: X11>=1.5.0.0 && < 1.6, mtl, unix
ghc-options: -funbox-strict-fields -Wall
ghc-prof-options: -prof -auto-all