diff options
| author | Adam Vogt <vogt.adam@gmail.com> | 2012-11-09 02:35:06 +0100 |
|---|---|---|
| committer | Adam Vogt <vogt.adam@gmail.com> | 2012-11-09 02:35:06 +0100 |
| commit | 7f324e08476792e522987867c0f8098eeb0e50e0 (patch) | |
| tree | b4deece8dd5395cc8ab39f73f6f36be50c07842f /XMonad/Prompt/RunOrRaise.hs | |
| parent | 8210d1d6f72daa3a95dac7be71f3d3358dfe1191 (diff) | |
| download | XMonadContrib-7f324e08476792e522987867c0f8098eeb0e50e0.tar.gz XMonadContrib-7f324e08476792e522987867c0f8098eeb0e50e0.tar.xz XMonadContrib-7f324e08476792e522987867c0f8098eeb0e50e0.zip | |
Use Control.Exception.catch explitly to avoid warnings
Ignore-this: 2cebdfe604c581f2b4a644e9aed726c7
The base that comes with ghc-7.6.1 no longer includes Prelude.catch;
so these modules were changed so that there is no warning for
import Prelude hiding (catch)
At the same time these changes should be compatible with older GHCs,
since the catch being has never been the one in the Prelude.
darcs-hash:20121109013506-1499c-c593662b0780eb49287efcbfe0e9796f7dd57c73.gz
Diffstat (limited to 'XMonad/Prompt/RunOrRaise.hs')
| -rw-r--r-- | XMonad/Prompt/RunOrRaise.hs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/XMonad/Prompt/RunOrRaise.hs b/XMonad/Prompt/RunOrRaise.hs index 8fb5c43..ce93de9 100644 --- a/XMonad/Prompt/RunOrRaise.hs +++ b/XMonad/Prompt/RunOrRaise.hs @@ -26,8 +26,7 @@ import XMonad.Prompt.Shell import XMonad.Actions.WindowGo (runOrRaise) import XMonad.Util.Run (runProcessWithInput) -import Prelude hiding (catch) -import Control.Exception +import Control.Exception as E import Control.Monad (liftM, liftM2) import System.Directory (doesDirectoryExist, doesFileExist, executable, getPermissions) @@ -71,7 +70,7 @@ isApp "thunderbird" = className =? "Thunderbird-bin" <||> className =? "Thunderb isApp x = liftM2 (==) pid $ pidof x pidof :: String -> Query Int -pidof x = io $ (runProcessWithInput "pidof" [x] [] >>= readIO) `catch` econst 0 +pidof x = io $ (runProcessWithInput "pidof" [x] [] >>= readIO) `E.catch` econst 0 pid :: Query Int pid = ask >>= (\w -> liftX $ withDisplay $ \d -> getPID d w) |