More DPut stuff

        * verbose/quiet without args shows report
        * verbose all - sets all tags verbose
        * quiet all - sets all tags quiet
        * XMisc defaults to verbose, everything else quiet
        * new XMan tag for ToxManager related stuff
        * s/hputStrLn stderr/dput XMisc/ in daemon code

1 files changed, 5 insertions, 4 deletions

diff --git a/ToxManager.hs b/ToxManager.hs
index cd835983..04695894 100644
--- a/ToxManager.hs
+++ b/ToxManager.hs
@@ -30,6 +30,7 @@ import System.IO
 import Text.Read
 import ToxToXMPP
 import XMPPServer                            (ConnectionKey)
+import DPut
 
 #ifdef THREAD_DEBUG
 import Control.Concurrent.Lifted.Instrument
@@ -64,7 +65,7 @@ toxman :: Announcer
             -> ToxManager ConnectionKey
 toxman announcer toxbkts tox presence = ToxManager
     { activateAccount        = \k pubname seckey -> do
-        hPutStrLn stderr $ "toxman ACTIVATE " ++ show (Tox.key2id $ toPublic seckey)
+        dput XMan $ "toxman ACTIVATE " ++ show (Tox.key2id $ toPublic seckey)
         let ContactInfo{ accounts } = Tox.toxContactInfo tox
             pub = toPublic seckey
             pubid = Tox.key2id pub
@@ -100,7 +101,7 @@ toxman announcer toxbkts tox presence = ToxManager
             return ()
 
     , deactivateAccount      = \k pubname -> do
-       hPutStrLn stderr $ "toxman DECTIVATE (todo) 1 " ++ show pubname
+       dput XMan $ "toxman DECTIVATE (todo) 1 " ++ show pubname
        let ContactInfo{ accounts } = Tox.toxContactInfo tox
            mpubid = readMaybe $ T.unpack $ T.take 43 pubname
        bStopped <- fmap (fromMaybe Nothing) $ atomically $ do
@@ -122,7 +123,7 @@ toxman announcer toxbkts tox presence = ToxManager
                 return (akey,bkts)
         else return Nothing
        forM_ bStopped $ \kbkts -> do
-           hPutStrLn stderr $ "toxman DECTIVATE (todo) 3 " ++ show pubname
+           dput XMan $ "toxman DECTIVATE (todo) 3 " ++ show pubname
            let Just pubid = mpubid
                pub        = Tox.id2key pubid
            forM_ kbkts $ \(akey,bkts) -> do
@@ -141,7 +142,7 @@ toxman announcer toxbkts tox presence = ToxManager
        let m = do meid   <- readMaybe $ T.unpack $ T.take 43 me
                   themid <- readMaybe $ T.unpack $ T.take 43 them
                   return $ Tox.Key meid themid
-       hPutStrLn stderr $ "toxman ConnectionPolicy " ++ show (me,them,p,fmap (const ()) m)
+       dput XMan $ "toxman ConnectionPolicy " ++ show (me,them,p,fmap (const ()) m)
        forM_  m $ \k -> do
        setPolicy (Tox.toxMgr tox) k p
        case p of