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 | ea1566b787bca0766233d0d300658d2acd8a2b9d (patch) | |
| tree | 8d7c700573e36195b7c9f0a265a1c0bda9310e65 /XMonad/ManageHook.hs | |
| parent | e3650fa208a29186feaaf9b70ea43786dadf872d (diff) | |
| download | metatile-ea1566b787bca0766233d0d300658d2acd8a2b9d.tar metatile-ea1566b787bca0766233d0d300658d2acd8a2b9d.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
Diffstat (limited to 'XMonad/ManageHook.hs')
| -rw-r--r-- | XMonad/ManageHook.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/XMonad/ManageHook.hs b/XMonad/ManageHook.hs index 97afce5..04926a0 100644 --- a/XMonad/ManageHook.hs +++ b/XMonad/ManageHook.hs @@ -22,7 +22,7 @@ import Prelude hiding (catch) import XMonad.Core import Graphics.X11.Xlib.Extras import Graphics.X11.Xlib (Display, Window, internAtom, wM_NAME) -import Control.Exception (bracket, catch) +import Control.Exception (bracket, catch, SomeException(..)) import Control.Monad.Reader import Data.Maybe import Data.Monoid @@ -72,10 +72,10 @@ title = ask >>= \w -> liftX $ do let getProp = (internAtom d "_NET_WM_NAME" False >>= getTextProperty d w) - `catch` \_ -> getTextProperty d w wM_NAME + `catch` \(SomeException _) -> getTextProperty d w wM_NAME extract prop = do l <- wcTextPropertyToTextList d prop return $ if null l then "" else head l - io $ bracket getProp (xFree . tp_value) extract `catch` \_ -> return "" + io $ bracket getProp (xFree . tp_value) extract `catch` \(SomeException _) -> return "" -- | Return the application name. appName :: Query String |