diff options
| author | Adam Vogt <vogt.adam@gmail.com> | 2010-01-18 19:15:32 +0100 |
|---|---|---|
| committer | Adam Vogt <vogt.adam@gmail.com> | 2010-01-18 19:15:32 +0100 |
| commit | 660e5d4eb38ae58acb5e91e40124738df812b8b7 (patch) | |
| tree | 8d7c700573e36195b7c9f0a265a1c0bda9310e65 /XMonad/Operations.hs | |
| parent | 1ce181eccefc47f35ef926f5d010d2c8ac678eaa (diff) | |
| download | xmonad-660e5d4eb38ae58acb5e91e40124738df812b8b7.tar.gz xmonad-660e5d4eb38ae58acb5e91e40124738df812b8b7.tar.xz xmonad-660e5d4eb38ae58acb5e91e40124738df812b8b7.zip | |
Correct warnings with ghc-6.12
Ignore-this: a48ed095b72aedec9eeb88781ace66dc
Changes include:
- compatibility with base-4 or 3 (base-2 untested) by using
extensible-exceptions. This adds an additional dependency for users of
ghc<6.10)
- list all dependencies again when -ftesting (change in Cabal-1.8.0.2)
- remove unnecessary imports
- suppress -fwarn-unused-do-bind, with appropriate Cabal-1.8 workaround,
described here:
http://www.haskell.org/pipermail/xmonad/2010-January/009554.html
darcs-hash:20100118181532-1499c-5c496678ef76f2f50b43b0fc4582cfef7c237654.gz
Diffstat (limited to 'XMonad/Operations.hs')
| -rw-r--r-- | XMonad/Operations.hs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/XMonad/Operations.hs b/XMonad/Operations.hs index d96ff1a..9614d47 100644 --- a/XMonad/Operations.hs +++ b/XMonad/Operations.hs @@ -33,9 +33,8 @@ import qualified Data.Set as S import Control.Applicative import Control.Monad.Reader import Control.Monad.State -import qualified Control.Exception as C +import qualified Control.Exception.Extensible as C -import System.IO import System.Posix.Process (executeFile) import Graphics.X11.Xlib import Graphics.X11.Xinerama (getScreenInfo) @@ -400,7 +399,7 @@ cleanMask km = do -- | Get the 'Pixel' value for a named color initColor :: Display -> String -> IO (Maybe Pixel) -initColor dpy c = C.handle (\_ -> return Nothing) $ +initColor dpy c = C.handle (\(C.SomeException _) -> return Nothing) $ (Just . color_pixel . fst) <$> allocNamedColor dpy colormap c where colormap = defaultColormap dpy (defaultScreen dpy) |