3 files changed, 14 insertions, 11 deletions

diff --git a/Presence/ConsoleWriter.hs b/Presence/ConsoleWriter.hs
index b5040ba7..e755b27f 100644
--- a/Presence/ConsoleWriter.hs
+++ b/Presence/ConsoleWriter.hs
@@ -16,7 +16,7 @@ import Control.Concurrent.STM
 import Data.Monoid
 import Data.Char
 import Data.Maybe
-import System.Environment
+import System.Environment hiding (setEnv)
 import System.Process ( rawSystem )
 import System.Exit ( ExitCode(ExitSuccess) )
 import System.Posix.Env     ( setEnv )
diff --git a/Presence/Nesting.hs b/Presence/Nesting.hs
index dd0e4113..720237fd 100644
--- a/Presence/Nesting.hs
+++ b/Presence/Nesting.hs
@@ -6,7 +6,7 @@ import Data.Conduit
 import Data.Conduit.Lift
 import Data.XML.Types
 import qualified Data.Text as S
-import Control.Monad.State
+import Control.Monad.State.Strict
 import qualified Data.List as List
 
 type Lang = S.Text
@@ -30,11 +30,10 @@ nesting = lift $ (return . nestingLevel) =<< get
 xmlLang :: Monad m => NestingXML o m (Maybe Lang)
 xmlLang = fmap (fmap snd . top . langStack) (lift get)
   where
-    top ( a :! as ) = Just a
+    top ( a :! _as ) = Just a
     top _           = Nothing
 
-
-trackNesting :: Monad m => ConduitM Event Event (StateT XMLState m) ()
+trackNesting :: Monad m => Conduit Event (StateT XMLState m) Event
 trackNesting = awaitForever doit
  where
   doit xml = do
@@ -61,7 +60,7 @@ lookupLang attrs =
 
 
 awaitCloser :: Monad m => Int -> NestingXML o m ()
-awaitCloser lvl = do
+awaitCloser lvl =
     fix $ \loop -> do
         lvl' <- nesting
         when (lvl' >= lvl) $ do
@@ -80,8 +79,7 @@ nextElement = do
         xml <- await
         case xml of
             Nothing                      -> return Nothing
-            Just (EventBeginElement _ _) -> do
-                return xml
+            Just (EventBeginElement _ _) -> return xml
             Just _ -> do
                 lvl' <- nesting
                 if (lvl'>=lvl) then loop 
diff --git a/Presence/XMPPServer.hs b/Presence/XMPPServer.hs
index 1f88fb9c..6176bbe6 100644
--- a/Presence/XMPPServer.hs
+++ b/Presence/XMPPServer.hs
@@ -51,7 +51,7 @@ import qualified Data.Conduit.List as CL
 import qualified Data.Conduit.Binary as CB
 import Data.Conduit.Blaze (builderToByteStringFlush)
 
-import qualified Text.XML.Stream.Render as XML
+import qualified Text.XML.Stream.Render as XML hiding (content)
 import qualified Text.XML.Stream.Parse as XML
 import Data.XML.Types as XML
 import Data.Maybe
@@ -77,6 +77,7 @@ import EventUtil
 import ControlMaybe
 import LockedChan
 import PeerResolve
+import Blaze.ByteString.Builder (Builder)
 
 peerport :: PortNumber
 peerport = 5269
@@ -247,13 +248,17 @@ wlog s = putStrLn s >> hFlush stdout
 wlogb :: ByteString -> IO ()
 wlogb s = Strict8.putStrLn s >> hFlush stdout
 
+renderBuilderFlush :: Monad m => XML.RenderSettings -> Conduit (Flush Event) m (Flush Builder)
+renderBuilderFlush = undefined
+
 xmlStream :: ReadCommand -> WriteCommand -> ( Source IO XML.Event
                                             , Sink (Flush XML.Event) IO () )
 xmlStream conread conwrite = (xsrc,xsnk)
  where
     xsrc = src $= XML.parseBytes XML.def
+    xsnk :: Sink (Flush Event) IO ()
     xsnk = -- XML.renderBytes XML.def =$ snk
-        XML.renderBuilderFlush XML.def 
+        renderBuilderFlush XML.def 
         =$= builderToByteStringFlush 
         =$= discardFlush 
         =$ snk
@@ -271,7 +276,7 @@ xmlStream conread conwrite = (xsrc,xsnk)
               (\v -> yield v >> src)
               v
     snk = awaitForever $ liftIO . conwrite
-        
+
 
 type FlagCommand = STM Bool
 type ReadCommand = IO (Maybe ByteString)