1 files changed, 11 insertions, 5 deletions

diff --git a/Presence/ConsoleWriter.hs b/Presence/ConsoleWriter.hs
index 3b02dbbc..9b62b00f 100644
--- a/Presence/ConsoleWriter.hs
+++ b/Presence/ConsoleWriter.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
 module ConsoleWriter
     ( ConsoleWriter(cwPresenceChan)
@@ -32,7 +33,7 @@ import XMPPServer     ( Stanza, makePresenceStanza, JabberShow(..), stanzaType
 import ClientState
 
 data ConsoleWriter = ConsoleWriter
-    { cwPresenceChan :: TChan (ClientState,Stanza)
+    { cwPresenceChan :: TMVar (ClientState,Stanza)
     , csActiveTTY :: TVar Word8
     , csUtmp :: TVar (Map Text (TVar (Maybe UtmpRecord)))
     , cwClients :: TVar (Map Text ClientState)
@@ -85,7 +86,7 @@ onLogin cs start = \e -> do
 
 newConsoleWriter :: IO ConsoleWriter
 newConsoleWriter = do
-    chan <- atomically newBroadcastTChan
+    chan <- atomically $ newEmptyTMVar
     cs <- atomically $ do
         ttyvar <- newTVar 0
         utmpvar <- newTVar Map.empty
@@ -131,6 +132,11 @@ toBCP47 lang = map hyphen $ takeWhile (/='.') lang
  where hyphen '_' = '-'
        hyphen  c  =  c
 
+#if MIN_VERSION_base(4,6,0)
+#else
+lookupEnv k = fmap (lookup k) getEnvironment
+#endif
+
 getPreferedLang :: IO Text
 getPreferedLang = do
     lang <- do
@@ -234,7 +240,7 @@ newCon log cw activeTTY utmp = do
                              , clientFlags = flgs }
     atomically $ do
         modifyTVar (cwClients cw) $ Map.insert r client
-        writeTChan (cwPresenceChan cw) (client,stanza)
+        putTMVar (cwPresenceChan cw) (client,stanza)
     loop client tty tu (Just u)
  where
     bstatus r ttynum mtu
@@ -277,7 +283,7 @@ newCon log cw activeTTY utmp = do
             dup <- cloneStanza stanza
             atomically $ do
                 writeTVar (clientStatus client) $ Just dup
-                writeTChan (cwPresenceChan cw) (client,stanza)
+                putTMVar (cwPresenceChan cw) (client,stanza)
             log $ status r tty' tu' <> " " <> jid
             loop client tty' tu' u
 
@@ -293,6 +299,6 @@ newCon log cw activeTTY utmp = do
                 stanza <- makePresenceStanza "jabber:client" (Just jid) Offline
                 atomically $ do
                     modifyTVar (cwClients cw) $ Map.delete (clientResource client)
-                    writeTChan (cwPresenceChan cw) (client,stanza)
+                    putTMVar (cwPresenceChan cw) (client,stanza)
                 log $ "Offline   " <> jid