From 99120a7f1012b5fa1fe4e9944fffb16686611ef5 Mon Sep 17 00:00:00 2001 From: Spencer Janssen Date: Wed, 16 Dec 2009 02:17:00 +0100 Subject: Update for X11 1.5.0.0 Ignore-this: 669c764c4c0ca516c8bdc1dfa35cd66 darcs-hash:20091216011700-25a6b-bfb30dfcc001e9b872402cd5adcb72af6fb65464 --- XMonad/Main.hsc | 2 +- xmonad.cabal | 2 +- 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 -- cgit v1.2.3