diff options
author | Adam Vogt <vogt.adam@gmail.com> | 2010-01-24 21:33:24 +0100 |
---|---|---|
committer | Adam Vogt <vogt.adam@gmail.com> | 2010-01-24 21:33:24 +0100 |
commit | ef7cd124086bd3c91eb5fea9bb13057a82c71f29 (patch) | |
tree | 74912ac97eb5d7bf6013e26c7ede9266f6de6614 /XMonad/Util/NamedWindows.hs | |
parent | 6516064616b0b993a694cb4e8423a53c60a9b3c3 (diff) | |
download | XMonadContrib-ef7cd124086bd3c91eb5fea9bb13057a82c71f29.tar.gz XMonadContrib-ef7cd124086bd3c91eb5fea9bb13057a82c71f29.tar.xz XMonadContrib-ef7cd124086bd3c91eb5fea9bb13057a82c71f29.zip |
Use extensible-exceptions to allow base-3 or base-4
Ignore-this: 136f35fcc0f3a824b96eea0f4e04f276
darcs-hash:20100124203324-1499c-6e811978a61feebf704e3cd7543cbcc0b3e8a0b3.gz
Diffstat (limited to 'XMonad/Util/NamedWindows.hs')
-rw-r--r-- | XMonad/Util/NamedWindows.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/XMonad/Util/NamedWindows.hs b/XMonad/Util/NamedWindows.hs index 17e401f..653eb54 100644 --- a/XMonad/Util/NamedWindows.hs +++ b/XMonad/Util/NamedWindows.hs @@ -24,7 +24,7 @@ module XMonad.Util.NamedWindows ( import Prelude hiding ( catch ) import Control.Applicative ( (<$>) ) -import Control.Exception ( bracket, catch ) +import Control.Exception.Extensible ( bracket, catch, SomeException(..) ) import Data.Maybe ( fromMaybe, listToMaybe ) import qualified XMonad.StackSet as W ( peek ) @@ -50,11 +50,11 @@ getName w = withDisplay $ \d -> do let getIt = bracket getProp (xFree . tp_value) (fmap (`NW` w) . copy) getProp = (internAtom d "_NET_WM_NAME" False >>= getTextProperty d w) - `catch` \_ -> getTextProperty d w wM_NAME + `catch` \(SomeException _) -> getTextProperty d w wM_NAME copy prop = fromMaybe "" . listToMaybe <$> wcTextPropertyToTextList d prop - io $ getIt `catch` \_ -> ((`NW` w) . resName) `fmap` getClassHint d w + io $ getIt `catch` \(SomeException _) -> ((`NW` w) . resName) `fmap` getClassHint d w unName :: NamedWindow -> Window unName (NW _ w) = w |