aboutsummaryrefslogtreecommitdiffstats
path: root/XMonad/Hooks
diff options
context:
space:
mode:
authorAdam Vogt <vogt.adam@gmail.com>2012-12-15 17:55:25 +0100
committerAdam Vogt <vogt.adam@gmail.com>2012-12-15 17:55:25 +0100
commit09735bb4696be97317b36000f885d0fe5d07b1d8 (patch)
treea7aaecb378dc639aaf840b9d089282a7703d7255 /XMonad/Hooks
parent4b10092007ab5d57209fd09125ba26b6ddbb369b (diff)
downloadXMonadContrib-09735bb4696be97317b36000f885d0fe5d07b1d8.tar.gz
XMonadContrib-09735bb4696be97317b36000f885d0fe5d07b1d8.tar.xz
XMonadContrib-09735bb4696be97317b36000f885d0fe5d07b1d8.zip
Address warnings from Debug modules
Ignore-this: f97416ae4feffe4e5f9916d14d9e1524 The warnings were related to ghc-7.6 removing Prelude.catch (triggering warnings regarding the import hiding it), as well as defaulting of some numeric types. darcs-hash:20121215165525-1499c-d960b0029306b898656aae8b61279a707f490c0b.gz
Diffstat (limited to 'XMonad/Hooks')
-rw-r--r--XMonad/Hooks/DebugEvents.hs9
1 files changed, 5 insertions, 4 deletions
diff --git a/XMonad/Hooks/DebugEvents.hs b/XMonad/Hooks/DebugEvents.hs
index d58595e..6256444 100644
--- a/XMonad/Hooks/DebugEvents.hs
+++ b/XMonad/Hooks/DebugEvents.hs
@@ -19,7 +19,7 @@
module XMonad.Hooks.DebugEvents (debugEventsHook) where
-import Prelude hiding (catch)
+import Prelude
import XMonad hiding (windowEvent
,(-->)
@@ -30,7 +30,7 @@ import XMonad.Util.DebugWindow (debugWindow)
-- import Graphics.X11.Xlib.Extras.GetAtomName (getAtomName)
-import Control.Exception.Extensible
+import Control.Exception.Extensible as E
import Control.Monad.State
import Control.Monad.Reader
import Data.Char (isDigit)
@@ -855,7 +855,7 @@ dumpPixmap = guardType pIXMAP $ do
append $ "pixmap " ++ showHex p ""
g' <- inX $ withDisplay $ \d -> io $
Just `fmap` getGeometry d (fromIntegral p)
- `catch`
+ `E.catch`
\e -> case fromException e of
Just x -> throw e `const` (x `asTypeOf` ExitSuccess)
_ -> return Nothing
@@ -1032,7 +1032,8 @@ dumpPercent = guardType cARDINAL $ do
Nothing -> return False
Just n' ->
let pct = 100 * fromIntegral n' / fromIntegral (maxBound :: Word32)
- in append $ show (round pct) ++ "%"
+ pct :: Double
+ in append $ show (round pct :: Integer) ++ "%"
dumpWmHints :: Decoder Bool
dumpWmHints =