Avoid awkward "flip (maybe ...)" pattern.

1 files changed, 11 insertions, 11 deletions

diff --git a/Presence/ConsoleWriter.hs b/Presence/ConsoleWriter.hs
index b80e477a..6b611e68 100644
--- a/Presence/ConsoleWriter.hs
+++ b/Presence/ConsoleWriter.hs
@@ -38,7 +38,7 @@ import UTmp           ( users2, utmp_file, UtmpRecord(..), UT_Type(..) )
 import FGConsole      ( forkTTYMonitor )
 import XMPPServer     ( Stanza, makePresenceStanza, JabberShow(..), stanzaType
                       , LangSpecificMessage(..), msgLangMap, cloneStanza, stanzaFrom )
-import ControlMaybe   ( handleIO_ )
+import ControlMaybe
 import ClientState
 
 data ConsoleWriter = ConsoleWriter
@@ -95,9 +95,8 @@ onLogin cs start = \e -> do
     let getActive = do
             tty <- readTVar $ csActiveTTY cs
             utmp <- readTVar $ csUtmp cs
-            flip (maybe $ return (tty,Nothing))
-                 (Map.lookup ("tty"<>tshow tty) utmp)
-                $ \tuvar -> do
+            fromMaybe (return (tty,Nothing))
+               $ Map.lookup ("tty"<>tshow tty) utmp <&> \tuvar -> do
             tu <- readTVar tuvar
             return (tty,tu)
 
@@ -201,13 +200,14 @@ messageText msg = do
     pref <- getPreferedLang
     let m = msgLangMap (stanzaType msg)
         key = lookupLang [pref] (map fst m)
-        choice = do
+        mchoice = do
             k <- key
             lookup k m
-    flip (maybe $ return "") choice $ \choice -> do
-    let subj = fmap ("Subject: " <>) $ msgSubject choice
-        ts = catMaybes [subj, msgBody choice]
-    return $ Text.intercalate "\n\n" ts
+    return $ fromMaybe "" $ do
+        choice <- mchoice
+        let subj = fmap ("Subject: " <>) $ msgSubject choice
+            ts = catMaybes [subj, msgBody choice]
+        return $ Text.intercalate "\n\n" ts
 
 readEnvFile :: String -> FilePath -> IO (Maybe String)
 readEnvFile var file = fmap parse $ readFile file
@@ -238,7 +238,7 @@ writeActiveTTY cw msg = do
                         $ Map.lookup ("tty"<>tshow num) utmp
                 return ( "/dev/tty" <> tshow num
                        , mbu )
-    flip (maybe $ return False) mbu $ \utmp -> do
+    fromMaybe (return False) $ mbu <&> \utmp -> do
     display <- fmap (fmap Text.pack)
         $ readEnvFile "DISPLAY" ("/proc/" ++ show (utmpPid utmp) ++ "/environ")
     case fmap (==utmpHost utmp) display of
@@ -325,7 +325,7 @@ newCon log cw activeTTY utmp = do
     ((tty,tu),u) <- atomically $
         liftM2 (,) activeTTY
                    (readTVar utmp)
-    flip (maybe $ return ()) u $ \u -> do
+    forM_ u $ \u -> do
     jid <- ujid u
     log $ status (resource u) tty tu <> " " <> jid <> "  pid=" <> tshow (utmpPid u)
             <> (if istty (resource u)