Update to base 4

Also while I was here I turned off the unused do bind warning.

2 files changed, 14 insertions, 14 deletions

diff --git a/Bustle.hs b/Bustle.hs
index e2b83a0..2501b58 100644
--- a/Bustle.hs
+++ b/Bustle.hs
@@ -179,9 +179,9 @@ displayError title body = do
 toET :: (Monad m, Error e') => (e -> e') -> Either e a -> ErrorT e' m a
 toET f = either (throwError . f) return
 
--- Catches exceptions from an IO action, and maps them into ErrorT
+-- Catches IOExceptions , and maps them into ErrorT
 etio :: (Error e', MonadIO io)
-     => (Exception -> e') -> IO a -> ErrorT e' io a
+     => (IOException -> e') -> IO a -> ErrorT e' io a
 etio f act = toET f =<< io (try act)
 
 loadLogWith :: B WindowInfo -> FilePath -> B ()
@@ -358,7 +358,7 @@ showAbout window = do
     dialog <- aboutDialogNew
 
     license <- (Just `fmap` (readFile =<< getDataFileName "LICENSE"))
-               `catch` (\e -> warn (show e) >> return Nothing)
+               `catch` (\e -> warn (show (e :: IOException)) >> return Nothing)
 
     dialog `set` [ aboutDialogName := "Bustle"
                  , aboutDialogVersion := showVersion version
diff --git a/bustle.cabal b/bustle.cabal
index 4ad5ccf..a999edb 100644
--- a/bustle.cabal
+++ b/bustle.cabal
@@ -20,30 +20,30 @@ Flag PostCabalizedGtk2HS
 
 Executable bustle
   Main-is:        Bustle.hs
-  Ghc-options:    -Wall -fno-warn-unused-imports
+  Ghc-options:    -Wall -fno-warn-unused-imports -fno-warn-unused-do-bind
 
   if flag(PostCabalizedGtk2HS)
     -- Since gtk2hs 0.11, pango is a separate package, and its module names
     -- have changed.
-    Build-Depends:  haskell98, mtl, base < 4, containers, parsec, filepath,
-                    process,
+    Build-Depends:  haskell98, mtl, base >= 4 && < 5, containers, parsec,
+                    filepath, process,
                     gtk > 0.11, glade, pango, glib, cairo
   else
-    Build-Depends:  haskell98, mtl, base < 4, containers, parsec, filepath,
-                    process,
+    Build-Depends:  haskell98, mtl, base >= 4 && < 5, containers, parsec,
+                    filepath, process,
                     gtk > 0.10 && < 0.11, glade, pango, glib, cairo
 
 Executable bustle-count
   Main-is:        bustle-count.hs
-  Build-Depends:  haskell98, base < 4, containers, parsec
-  Ghc-options:    -Wall -fno-warn-unused-imports
+  Build-Depends:  haskell98, base >= 4 && < 5, containers, parsec
+  Ghc-options:    -Wall -fno-warn-unused-imports -fno-warn-unused-do-bind
 
 Executable bustle-time
   Main-is:        bustle-time.hs
-  Build-Depends:  haskell98, base < 4, containers, parsec
-  Ghc-options:    -Wall -fno-warn-unused-imports
+  Build-Depends:  haskell98, base >= 4 && < 5, containers, parsec
+  Ghc-options:    -Wall -fno-warn-unused-imports -fno-warn-unused-do-bind
 
 Executable bustle-dot
   Main-is:        bustle-dot.hs
-  Build-Depends:  haskell98, base < 4, containers, parsec
-  Ghc-options:    -Wall -fno-warn-unused-imports
+  Build-Depends:  haskell98, base >= 4 && < 5, containers, parsec
+  Ghc-options:    -Wall -fno-warn-unused-imports -fno-warn-unused-do-bind