Updates for Layout API change

Circle.hs

@@ -5,7 +5,7 @@ import XMonad
 
 circle :: Layout
 circle = Layout { doLayout = circleLayout,
-                  modifyLayout = const Nothing }
+                  modifyLayout = return . const Nothing }
 
 circleLayout :: Rectangle -> [Window] -> X [(Window, Rectangle)]
 circleLayout _ []     = return []

Spiral.hs

@@ -33,7 +33,7 @@ blend scale ratios = zipWith (+) ratios scaleFactors
 
 spiral :: Rational -> Layout
 spiral scale = Layout { doLayout = fibLayout,
-                        modifyLayout = \m -> fmap resize $ fromMessage m }
+                        modifyLayout = \m -> return $ fmap resize $ fromMessage m }
     where
       fibLayout sc ws = return $ zip ws rects
           where ratios = blend scale . reverse . take (length ws - 1) . mkRatios $ tail fibs

TwoPane.hs

@@ -24,7 +24,7 @@ twoPane delta split = Layout { doLayout = arrange, modifyLayout = message }
     -- there are one or zero windows
     arrange rect ws         = return . map (\w -> (w, rect)) $ ws
 
-    message x = case fromMessage x of
+    message x = return $ case fromMessage x of
                     Just Shrink -> Just (twoPane delta (split - delta))
                     Just Expand -> Just (twoPane delta (split + delta))
                     _           -> Nothing