renamed outgoingConnections to remotePeers in the PresenceState global

record.

1 files changed, 10 insertions, 10 deletions

diff --git a/Presence/main.hs b/Presence/main.hs
index 3d5ac046..92ef7034 100644
--- a/Presence/main.hs
+++ b/Presence/main.hs
@@ -88,8 +88,8 @@ data PresenceState = PresenceState
     --                   on connect so that it can populate it's notion of online users.
     , remoteUsers :: TVar (Map Peer (RefCount,TVar (MultiMap JabberUser (JabberResource,JabberShow))))
 
-    -- outGoingConnections  - a set of channels that may be used to send messages to remote peers.
-    , outGoingConnections :: OutgoingConnections CachedMessages
+    -- remotePeers  - a set of channels that may be used to send messages to remote peers.
+    , remotePeers :: OutgoingConnections CachedMessages
     }
 
 
@@ -244,7 +244,7 @@ instance JabberClientSession ClientSession where
 
         rosterPush (RequestedSubscription user jid_str) (presence_state s)
 
-        sendMessage (outGoingConnections . presence_state $ s) 
+        sendMessage (remotePeers . presence_state $ s) 
                     (Solicitation me jid)
                     (peer jid)
             
@@ -298,12 +298,12 @@ instance JabberClientSession ClientSession where
         rosterPush (NewSubscriber user contact) (presence_state s)
 
         -- notify peer
-        sendMessage (outGoingConnections . presence_state $ s) 
+        sendMessage (remotePeers . presence_state $ s) 
                     (Approval (JID (Just user) LocalHost Nothing) 
                               cjid)
                     (peer cjid)
         presence <- getUserStatus (presence_state s) user
-        let cons = outGoingConnections . presence_state $ s
+        let cons = remotePeers . presence_state $ s
         forM_ presence $ \p -> sendMessage cons (OutBoundPresence p) (peer cjid)
         return ()
 
@@ -322,14 +322,14 @@ instance JabberClientSession ClientSession where
 
         -- notify peer
         when (was_pending || was_subscribed) $ do
-        let cons = outGoingConnections . presence_state $ s
+        let cons = remotePeers . presence_state $ s
             isonline (Presence _ Offline) = False
             isonline _                    = True
         presence <- fmap (filter isonline) $ getUserStatus (presence_state s) user
         me <- getJID s
         when (not (null presence)) $
             sendMessage cons (OutBoundPresence . Presence me $ Offline) (peer cjid)
-        sendMessage (outGoingConnections . presence_state $ s) 
+        sendMessage (remotePeers . presence_state $ s) 
                     (Rejection (JID (Just user) LocalHost Nothing) 
                               cjid)
                     (peer cjid)
@@ -398,7 +398,7 @@ instance JabberPeerSession PeerSession where
                     stat    -> maybe jids (\r -> MM.insert u (r,stat) jids) rsc
 
     sendPeerMessage session msg = do
-        let cons = outGoingConnections . peer_global $ session
+        let cons = remotePeers . peer_global $ session
         putStrLn $ "sendPeerMessage " <++> bshow msg <++> " --> "<++>bshow (peer_name session)
         sendMessage cons msg (peer_name session)
 
@@ -612,7 +612,7 @@ sendProbes state jid = do
         when noinfo $ do
         let msg = if got then PresenceProbe jid buddy else Solicitation jid buddy
         L.putStrLn $ "sendMessage " <++> bshow msg
-        sendMessage (outGoingConnections state) msg (peer buddy) 
+        sendMessage (remotePeers state) msg (peer buddy) 
 
 
 track_login host state e = do
@@ -666,7 +666,7 @@ start ip4or6 = do
         dologin :: t -> IO ()
 
     chan <- atomically $ subscribeToChan (localSubscriber global_state)
-    remotes <- forkIO $ seekRemotePeers (PeerSessions global_state) chan (outGoingConnections global_state)
+    remotes <- forkIO $ seekRemotePeers (PeerSessions global_state) chan (remotePeers global_state)
 
     installHandler sigUSR1 (Catch (dologin (userError "signaled"))) Nothing
     -- installHandler sigTERM (CatchOnce (dologin (userError "term signaled"))) Nothing