3 files changed, 17 insertions, 16 deletions

diff --git a/Presence/XMLToByteStrings.hs b/Presence/XMLToByteStrings.hs
index d8d2e965..92ac05cd 100644
--- a/Presence/XMLToByteStrings.hs
+++ b/Presence/XMLToByteStrings.hs
@@ -1,5 +1,7 @@
 {-# LANGUAGE CPP #-}
-module XMLToByteStrings (xmlToByteStrings) where
+module XMLToByteStrings 
+    ( xmlToByteStrings
+    , prettyPrint ) where
 
 import Control.Monad.IO.Class
 import Control.Monad.Trans.Class
@@ -8,13 +10,15 @@ import Control.Monad.Fix
 import Control.Monad (when)
 import           Data.Conduit
 import qualified Data.Conduit.List as CL
+import qualified Data.Conduit.Binary as CB
 import Data.XML.Types as XML (Event)
-import qualified Data.ByteString as S (ByteString)
+import qualified Data.ByteString as S (ByteString,append)
+import qualified Data.ByteString.Char8 as S (putStrLn)
 #ifdef RENDERFLUSH
 import Data.Conduit.Blaze (builderToByteStringFlush)
-import Text.XML.Stream.Render (def,renderBuilderFlush)
+import Text.XML.Stream.Render (def,renderBuilderFlush,renderBytes,rsPretty)
 #else
-import Text.XML.Stream.Render (def,renderBytes)
+import Text.XML.Stream.Render (def,renderBytes,rsPretty)
 #endif
 
 fixMaybeT f = (>> return ()) . runMaybeT . fix $ f
@@ -62,3 +66,7 @@ renderChunks = fixMaybeT $  \loop -> do
     loop
 #endif
 
+
+prettyPrint prefix xs = 
+    liftIO $ do
+        CL.sourceList xs $= renderBytes (def { rsPretty=True }) =$= CB.lines $$ CL.mapM_ (S.putStrLn . (prefix `S.append`))
diff --git a/Presence/XMPP.hs b/Presence/XMPP.hs
index ec2feb3a..a469c08e 100644
--- a/Presence/XMPP.hs
+++ b/Presence/XMPP.hs
@@ -3,7 +3,6 @@
 {-# LANGUAGE ViewPatterns        #-}
 module XMPP 
     ( module XMPPTypes
-    , module SocketLike
     , listenForXmppClients
     , listenForRemotePeers
     , newServerConnections
@@ -15,7 +14,6 @@ module XMPP
 
 import ServerC
 import XMPPTypes
-import SocketLike
 import ByteStringOperators
 import ControlMaybe
 import XMLToByteStrings
@@ -42,10 +40,7 @@ import System.IO
     )
 import Control.Concurrent.STM
 import Data.Conduit
-import qualified Data.Conduit.List as CL
-import qualified Data.Conduit.Binary as CB
 import Data.ByteString (ByteString)
-import qualified Data.ByteString.Char8 as S (putStrLn,append)
 import qualified Data.ByteString.Lazy.Char8 as L
     ( putStrLn
     , fromChunks
@@ -62,8 +57,7 @@ import System.IO.Error (isDoesNotExistError)
 import Control.Monad.IO.Class
 import Control.Monad.Trans.Class
 import Control.Monad.Trans.Maybe
-import Text.XML.Stream.Parse (parseBytes,content)
-import Text.XML.Stream.Render
+import Text.XML.Stream.Parse (def,parseBytes,content)
 import Data.XML.Types as XML
 import qualified Data.Text as S (takeWhile)
 import Data.Text.Encoding      as S (decodeUtf8,encodeUtf8)
@@ -458,10 +452,6 @@ fromClient session cmdChan = doNestingXML $ do
     withXML $ \xml -> do
     log $ "end-of-document: " <++> bshow xml
 
-prettyPrint prefix xs = 
-    liftIO $ do
-        CL.sourceList xs $= renderBytes (def { rsPretty=True }) =$= CB.lines $$ CL.mapM_ (S.putStrLn . (prefix `S.append`))
-
 
 rosterPush to contact attrs = do
     let n   = name to
diff --git a/Presence/XMPPTypes.hs b/Presence/XMPPTypes.hs
index 4802002c..a44f7fb1 100644
--- a/Presence/XMPPTypes.hs
+++ b/Presence/XMPPTypes.hs
@@ -1,6 +1,9 @@
 {-# LANGUAGE OverloadedStrings   #-}
 {-# LANGUAGE TypeFamilies        #-}
-module XMPPTypes where
+module XMPPTypes 
+ ( module XMPPTypes
+ , module SocketLike
+ ) where
 
 import Network.Socket 
     ( Family(..)