3 files changed, 5 insertions, 4 deletions

diff --git a/Presence/XMPPServer.hs b/Presence/XMPPServer.hs
index ffa02b25..936b2137 100644
--- a/Presence/XMPPServer.hs
+++ b/Presence/XMPPServer.hs
@@ -98,6 +98,7 @@ import Data.Void (Void)
 import System.Endian (toBE32)
 import Control.Applicative
 import System.IO
+import DPut
 
 -- peerport :: PortNumber
 -- peerport = 5269
@@ -281,10 +282,10 @@ peerKeyToText (ClientKey { localAddress=addr }) = "ErrorClIeNt0"
 
 
 wlog :: String -> IO ()
-wlog s = putStrLn s >> hFlush stdout
+wlog = dput XWLog
 
 wlogb :: ByteString -> IO ()
-wlogb s = Strict8.putStrLn s >> hFlush stdout
+wlogb = wlog . Strict8.unpack
 
 flushPassThrough :: Monad m => Conduit a m b -> Conduit (Flush a) m (Flush b)
 flushPassThrough c = getZipConduit $ ZipConduit (onlyChunks =$= mapOutput Chunk c) <* ZipConduit onlyFlushes
diff --git a/src/DPut.hs b/src/DPut.hs
index 3cb31160..b305a581 100644
--- a/src/DPut.hs
+++ b/src/DPut.hs
@@ -7,7 +7,7 @@ import Data.Maybe
 import System.IO.Unsafe (unsafePerformIO)
 import System.Log.Logger
 
-data DebugTag = XAnnounce | XDHT | XOnion | XNetCrypto | XPing | XLan | XMisc
+data DebugTag = XAnnounce | XDHT | XOnion | XNetCrypto | XPing | XLan | XMisc | XWLog
     deriving (Eq,Ord,Show,Read,Enum,Bounded)
 
 appName :: String
diff --git a/src/Network/Tox/Onion/Transport.hs b/src/Network/Tox/Onion/Transport.hs
index 0da48f76..8a66f2b2 100644
--- a/src/Network/Tox/Onion/Transport.hs
+++ b/src/Network/Tox/Onion/Transport.hs
@@ -924,7 +924,7 @@ encodeDataToRoute crypto ((me,omsg), AnnouncedRendezvous toxid (Rendezvous pub n
                                           }
     outerSecret <- lookupSharedSecret crypto (onionAliasSecret crypto) pub nonce
     let dta = ToxCrypto.encrypt outerSecret plain
-    hPutStrLn stderr $ unlines
+    dput XOnion $ unlines
         [ "encodeDataToRoute    me=" ++ show (key2id me)
         , "                  dhtpk=" ++ case omsg of
                                         OnionDHTPublicKey dmsg -> show (key2id $ dhtpk dmsg)