WIP: Deliver friend-request to xmpp client. (continued)

1 files changed, 4 insertions, 5 deletions

diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index 4f26fc16..b6680f2e 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -1412,17 +1412,16 @@ toxman announcer toxbkts tox presence = ToxManager
         let ContactInfo{ accounts } = Tox.toxContactInfo tox
             pub = toPublic seckey
             pubid = Tox.key2id pub
-        (mcon,newlyActive) <- atomically $ do
+        (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
             modifyTVar accounts (HashMap.insert pubid acnt)
-            mcon <- fmap ((,) acnt) . Map.lookup k <$> readTVar (keyToChan presence)
             if not (Set.null rs)
-                then return (mcon,[])
+                then return (acnt,[])
                 else do
-                    fmap ((,) mcon) $ forM toxbkts $ \(nm,bkts) -> do
+                    fmap ((,) acnt) $ forM toxbkts $ \(nm,bkts) -> do
                         akey <- packAnnounceKey announcer (nm ++ "id:" ++ show pubid)
                         return (akey,bkts)
         forM_ newlyActive $ \(akey,bkts) -> do
@@ -1437,7 +1436,7 @@ toxman announcer toxbkts tox presence = ToxManager
                                      toxAnnounceInterval)
                      pub
 
-            forM_ mcon $ \(acnt,conn) -> forkAccountWatcher acnt tox conn
+            forkAccountWatcher acnt tox presence
             return ()
     , deactivateAccount      = \k pubname -> do
        bStopped <- fmap (fromMaybe False) $ atomically $ do