From ef7cd124086bd3c91eb5fea9bb13057a82c71f29 Mon Sep 17 00:00:00 2001 From: Adam Vogt Date: Sun, 24 Jan 2010 21:33:24 +0100 Subject: Use extensible-exceptions to allow base-3 or base-4 Ignore-this: 136f35fcc0f3a824b96eea0f4e04f276 darcs-hash:20100124203324-1499c-6e811978a61feebf704e3cd7543cbcc0b3e8a0b3.gz --- XMonad/Util/NamedWindows.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'XMonad/Util/NamedWindows.hs') 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 -- cgit v1.2.3