Renamed Roster -> ContactInfo, reverted toxManager stubs.

1 files changed, 7 insertions, 7 deletions

diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index ed7d5e63..73ae5a57 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -90,7 +90,7 @@ import qualified Network.Tox.Onion.Handlers as Tox
 import qualified Network.Tox.Crypto.Transport as Tox (CryptoMessage)
 import qualified Network.Tox.Crypto.Handlers as Tox
 import Data.Typeable
-import Roster
+import Network.Tox.ContactInfo as Tox
 import OnionRouter
 import PingMachine
 
@@ -384,7 +384,7 @@ data Session = Session
     , cryptosessions    :: Tox.NetCryptoSessions
     , toxkeys           :: TVar Tox.AnnouncedKeys
     , userkeys          :: TVar [(SecretKey,PublicKey)]
-    , roster            :: Roster
+    , roster            :: Tox.ContactInfo
     , connectionManager :: ConnectionManager
     , onionRouter       :: OnionRouter
     , announcer         :: Announcer
@@ -569,7 +569,7 @@ clientSession s@Session{..} sock cnum h = do
                         oldks <- atomically $ do
                             ks <- readTVar userkeys
                             modifyTVar userkeys ((secret,pubkey):)
-                            addRoster roster secret
+                            Tox.addContactInfo roster secret
                             return ks
                         let asString = show . Tox.key2id
                         hPutClient h $ unlines $ map (mappend "  " . show . Tox.key2id . snd) oldks
@@ -591,7 +591,7 @@ clientSession s@Session{..} sock cnum h = do
                         oldks <- atomically $ do
                             oldks <- readTVar userkeys
                             modifyTVar userkeys (pairs ++)
-                            forM pairs $ \(sk,_) -> addRoster roster sk
+                            forM pairs $ \(sk,_) -> Tox.addContactInfo roster sk
                             return oldks
                         hPutClient h $ unlines $ map (mappend "  " . show . Tox.key2id . snd) oldks
                                                   ++ map (mappend " *" . show . Tox.key2id .snd) pairs
@@ -604,7 +604,7 @@ clientSession s@Session{..} sock cnum h = do
                             pairs = map (toPair . f) mbSecs
                         ks <- atomically $ do
                             modifyTVar userkeys (filter (`notElem` pairs) )
-                            forM pairs $ \(_,pk) -> delRoster roster pk
+                            forM pairs $ \(_,pk) -> Tox.delContactInfo roster pk
                             readTVar userkeys
                         hPutClient h . showReport $ map mkrow ks
 
@@ -1332,12 +1332,12 @@ main = runResourceT $ liftBaseWith $ \resT -> do
         installHandler sigINT (CatchOnce (atomically $ writeTVar signalQuit True)) Nothing
         let defaultToxData = do
                 toxids <- atomically $ newTVar []
-                rster <- newRoster
+                rster <- Tox.newContactInfo
                 orouter <- newOnionRouter (hPutStrLn stderr)
                 return (toxids, rster, orouter)
         (toxids,rstr,orouter) <- fromMaybe defaultToxData $ do
             tox <- mbtox
-            return $ return ( userKeys (Tox.toxCryptoKeys tox), Tox.toxRoster tox, Tox.toxOnionRoutes tox )
+            return $ return ( userKeys (Tox.toxCryptoKeys tox), Tox.toxContactInfo tox, Tox.toxOnionRoutes tox )
         let session = clientSession0 $ Session
                 { netname           = concat $ take 1 $ Map.keys dhts -- initial default DHT
                 , dhts              = dhts  -- all DHTs