1 files changed, 6 insertions, 4 deletions

diff --git a/ToxManager.hs b/ToxManager.hs
index 793a3b8a..44b7a5ef 100644
--- a/ToxManager.hs
+++ b/ToxManager.hs
@@ -63,6 +63,8 @@ import Connection
 import Connection.Tcp (TCPStatus)
 import GHC.Conc       (unsafeIOToSTM)
 
+data Pending = ToxStatus ToxProgress | XMPPStatus TCPStatus
+
 
 toxAnnounceSendData :: Tox.Tox JabberClients
                         -> PublicKey
@@ -96,7 +98,7 @@ toxman :: TVar (Map.Map Uniq24 AggregateSession)
             -> Announcer
             -> [(String,TVar (BucketList Tox.NodeInfo))]
             -> Tox.Tox JabberClients
-            -> PresenceState TCPStatus
+            -> PresenceState Pending
             -> ToxManager ClientAddress
 toxman ssvar announcer toxbkts tox presence = ToxManager
     { activateAccount        = \k pubname seckey -> do
@@ -248,7 +250,7 @@ initPerClient = do
 data ToxToXMPP = ToxToXMPP
     { txAnnouncer      :: Announcer
     , txAccount        :: Account JabberClients
-    , txPresence       :: PresenceState TCPStatus
+    , txPresence       :: PresenceState Pending
     , txTox            :: Tox JabberClients
     , txSessions       :: TVar (Map.Map Uniq24 AggregateSession)
     }
@@ -552,7 +554,7 @@ updateRoster tx them = do
 -- | Returns a list of nospam values to use for friend requests to send to a
 -- remote peer.  This list is non-empty only when it is desirable to send
 -- friend requests.
-checkSoliciting :: PresenceState TCPStatus -> PublicKey -> PublicKey -> Contact -> IO [NoSpam]
+checkSoliciting :: PresenceState Pending -> PublicKey -> PublicKey -> Contact -> IO [NoSpam]
 checkSoliciting presence me them contact = do
     let theirhost = T.pack $ show (key2id them) ++ ".tox"
         myhost = T.pack $ show (key2id me) ++ ".tox"
@@ -658,7 +660,7 @@ stopConnecting ToxToXMPP{txAnnouncer=announcer,txAccount=acnt} them reason = do
     cancel announcer akeyD
 
 forkAccountWatcher :: TVar (Map.Map Uniq24 AggregateSession)
-                      -> Account JabberClients -> Tox JabberClients -> PresenceState TCPStatus -> Announcer -> IO ThreadId
+                      -> Account JabberClients -> Tox JabberClients -> PresenceState Pending -> Announcer -> IO ThreadId
 forkAccountWatcher ssvar acc tox st announcer = forkIO $ do
     myThreadId >>= flip labelThread ("online:"
                                       ++ show (key2id $ toPublic $ userSecret acc))