diff options
author | Joey Hess <joey@kitenet.net> | 2012-11-03 14:16:17 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2012-11-03 14:16:17 -0400 |
commit | 1279d72b4e4fe77abb983954dc937021559d4169 (patch) | |
tree | 6c7d718be97634ddaaa2a9dd90637363cc0ebeb0 /Assistant/Monad.hs | |
parent | 85eb13a57a7c0c4f2df46ab4c01c434585370999 (diff) |
refactor XMPP client
Diffstat (limited to 'Assistant/Monad.hs')
-rw-r--r-- | Assistant/Monad.hs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Assistant/Monad.hs b/Assistant/Monad.hs index 64718a7a1..9f5c42aa3 100644 --- a/Assistant/Monad.hs +++ b/Assistant/Monad.hs @@ -35,6 +35,7 @@ import Assistant.Types.BranchChange import Assistant.Types.Commits import Assistant.Types.Changes import Assistant.Types.Buddies +import Assistant.Types.NetMessager newtype Assistant a = Assistant { mkAssistant :: ReaderT AssistantData IO a } deriving ( @@ -55,12 +56,12 @@ data AssistantData = AssistantData , scanRemoteMap :: ScanRemoteMap , transferQueue :: TransferQueue , transferSlots :: TransferSlots - , pushNotifier :: PushNotifier , failedPushMap :: FailedPushMap , commitChan :: CommitChan , changeChan :: ChangeChan , branchChangeHandle :: BranchChangeHandle , buddyList :: BuddyList + , netMessagerControl :: NetMessagerControl } newAssistantData :: ThreadState -> DaemonStatusHandle -> IO AssistantData @@ -71,12 +72,12 @@ newAssistantData st dstatus = AssistantData <*> newScanRemoteMap <*> newTransferQueue <*> newTransferSlots - <*> newPushNotifier <*> newFailedPushMap <*> newCommitChan <*> newChangeChan <*> newBranchChangeHandle <*> newBuddyList + <*> newNetMessagerControl runAssistant :: Assistant a -> AssistantData -> IO a runAssistant a = runReaderT (mkAssistant a) |