1 files changed, 19 insertions, 13 deletions

diff --git a/ToxManager.hs b/ToxManager.hs
index 460b2fe5..cd835983 100644
--- a/ToxManager.hs
+++ b/ToxManager.hs
@@ -11,8 +11,8 @@ import Control.Concurrent.STM
 import Control.Monad
 import Crypto.Tox
 import qualified Data.HashMap.Strict         as HashMap
+import qualified Data.Map                    as Map
 import Data.Maybe
-import qualified Data.Set                    as Set
 import qualified Data.Text                   as T
 import Data.Time.Clock.POSIX
 import Network.Address
@@ -38,10 +38,11 @@ import Control.Concurrent.Lifted
 import GHC.Conc                  (labelThread)
 #endif
 
-toxAnnounceSendData :: Tox.Tox -> PublicKey
-                               -> Nonce32
-                               -> Maybe Tox.NodeInfo
-                               -> IO (Maybe (Tox.Rendezvous, Tox.AnnounceResponse))
+toxAnnounceSendData :: Tox.Tox JabberClients
+                        -> PublicKey
+                        -> Nonce32
+                        -> Maybe Tox.NodeInfo
+                        -> IO (Maybe (Tox.Rendezvous, Tox.AnnounceResponse))
 toxAnnounceSendData tox pubkey token = \case
     Just ni -> Tox.putRendezvous (Tox.onionTimeout tox)
                                  (Tox.toxCryptoKeys tox)
@@ -56,7 +57,11 @@ toxAnnounceSendData tox pubkey token = \case
 --
 -- These hooks will be invoked in order to connect to *.tox hosts in a user's
 -- XMPP roster.
-toxman :: Announcer -> [(String,TVar (BucketList Tox.NodeInfo))] -> Tox.Tox -> PresenceState -> ToxManager ConnectionKey
+toxman :: Announcer
+            -> [(String,TVar (BucketList Tox.NodeInfo))]
+            -> Tox.Tox JabberClients
+            -> PresenceState
+            -> ToxManager ConnectionKey
 toxman announcer toxbkts tox presence = ToxManager
     { activateAccount        = \k pubname seckey -> do
         hPutStrLn stderr $ "toxman ACTIVATE " ++ show (Tox.key2id $ toPublic seckey)
@@ -65,11 +70,12 @@ toxman announcer toxbkts tox presence = ToxManager
             pubid = Tox.key2id pub
         (acnt,newlyActive) <- atomically $ do
             macnt <- HashMap.lookup pubid <$> readTVar accounts
-            acnt <- maybe (newAccount seckey) return macnt
-            rs <- readTVar $ clientRefs acnt
-            writeTVar (clientRefs acnt) $! Set.insert k rs
+            acnt <- maybe (newAccount seckey Map.empty) return macnt
+            rs <- readTVar $ accountExtra acnt
+            perclient <- initPerClient
+            writeTVar (accountExtra acnt) $! Map.insert k perclient rs
             modifyTVar accounts (HashMap.insert pubid acnt)
-            if not (Set.null rs)
+            if not (Map.null rs)
                 then return (acnt,Nothing)
                 else return (acnt,Just $ \nid -> foldr interweave []
                                                  . map (R.kclosest (searchSpace (toxQSearch tox))
@@ -101,11 +107,11 @@ toxman announcer toxbkts tox presence = ToxManager
         forM mpubid $ \pubid -> do
         refs <- do
             macnt <- HashMap.lookup pubid <$> readTVar accounts
-            rs <- fromMaybe Set.empty <$> mapM (readTVar . clientRefs) macnt
+            rs <- fromMaybe Map.empty <$> mapM (readTVar . accountExtra) macnt
             forM_ macnt $ \acnt -> do
-                modifyTVar' (clientRefs acnt) $ Set.delete k
+                modifyTVar' (accountExtra acnt) $ Map.delete k
             return rs
-        if (Set.null $ refs Set.\\ Set.singleton k) then do
+        if (Map.null $ Map.delete k refs) then do
             --   TODO
             --   If this is the last reference to a non-connected contact:
             --      Stop the recurring search for that contact