rename

Assistant.hs

@@ -105,7 +105,7 @@
  - BranchChanged (STM SampleVar)
  - 	Changes to the git-annex branch are indicated by updating this
  - 	SampleVar.
- - NetMessagerControl (STM TChan, SampleVar)
+ - NetMessager (STM TChan, SampleVar)
  - 	Used to feed messages to the built-in XMPP client, and
  - 	signal it when it needs to restart due to configuration or
  - 	networking changes.

Assistant/Monad.hs

@@ -61,7 +61,7 @@ data AssistantData = AssistantData
 	, changeChan :: ChangeChan
 	, branchChangeHandle :: BranchChangeHandle
 	, buddyList :: BuddyList
-	, netMessagerControl :: NetMessagerControl
+	, netMessager :: NetMessager
 	}
 
 newAssistantData :: ThreadState -> DaemonStatusHandle -> IO AssistantData
@@ -77,7 +77,7 @@ newAssistantData st dstatus = AssistantData
 	<*> newChangeChan
 	<*> newBranchChangeHandle
 	<*> newBuddyList
-	<*> newNetMessagerControl
+	<*> newNetMessager
 
 runAssistant :: AssistantData -> Assistant a -> IO a
 runAssistant d a = runReaderT (mkAssistant a) d

Assistant/NetMessager.hs

@@ -15,14 +15,14 @@ import Control.Concurrent.MSampleVar
 
 sendNetMessage :: NetMessage -> Assistant ()
 sendNetMessage m = 
-	(atomically . flip writeTChan m) <<~ (netMessages . netMessagerControl)
+	(atomically . flip writeTChan m) <<~ (netMessages . netMessager)
 
 waitNetMessage :: Assistant (NetMessage)
-waitNetMessage = (atomically . readTChan) <<~ (netMessages . netMessagerControl)
+waitNetMessage = (atomically . readTChan) <<~ (netMessages . netMessager)
 
 notifyNetMessagerRestart :: Assistant ()
 notifyNetMessagerRestart =
-	flip writeSV () <<~ (netMessagerRestart . netMessagerControl)
+	flip writeSV () <<~ (netMessagerRestart . netMessager)
 
 waitNetMessagerRestart :: Assistant ()
-waitNetMessagerRestart = readSV <<~ (netMessagerRestart . netMessagerControl)
+waitNetMessagerRestart = readSV <<~ (netMessagerRestart . netMessager)

Assistant/Types/NetMessager.hs

@@ -39,12 +39,12 @@ data NetMessage
 {- Something used to identify a specific client to send the message to. -}
 type ClientID = Text
 
-data NetMessagerControl = NetMessagerControl
+data NetMessager = NetMessager
 	{ netMessages :: TChan (NetMessage)
 	, netMessagerRestart :: MSampleVar ()
 	}
 
-newNetMessagerControl :: IO NetMessagerControl
-newNetMessagerControl = NetMessagerControl
+newNetMessager :: IO NetMessager
+newNetMessager = NetMessager
 	<$> atomically newTChan
 	<*> newEmptySV