Generalize the type of catchIO, use it in Main.hs

darcs-hash:20080128054651-a5988-263142a13a2bb7dbe0d0084456fbe29b7b603e47

2 files changed, 2 insertions, 3 deletions

diff --git a/Main.hs b/Main.hs
index 2be135c..00e8d59 100644
--- a/Main.hs
+++ b/Main.hs
@@ -16,7 +16,6 @@ module Main (main) where
 
 import XMonad
 
-import Control.Exception (handle)
 import System.IO
 import System.Info
 import System.Environment
@@ -31,7 +30,7 @@ import qualified Properties
 main :: IO ()
 main = do
     args <- getArgs
-    let launch = handle (hPrint stderr) buildLaunch >> xmonad defaultConfig
+    let launch = catchIO buildLaunch >> xmonad defaultConfig
     case args of
         []                    -> launch
         ["--resume", _]       -> launch
diff --git a/XMonad/Core.hs b/XMonad/Core.hs
index df9c4b7..8dfa91f 100644
--- a/XMonad/Core.hs
+++ b/XMonad/Core.hs
@@ -291,7 +291,7 @@ io = liftIO
 
 -- | Lift an IO action into the X monad.  If the action results in an IO
 -- exception, log the exception to stderr and continue normal execution.
-catchIO :: IO () -> X ()
+catchIO :: MonadIO m => IO () -> m ()
 catchIO f = io (f `catch` \e -> hPrint stderr e >> hFlush stderr)
 
 -- | spawn. Launch an external application