mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

moved ThreadedMonad to Types

Browse source
This commit is contained in:
Joey Hess 2012-10-29 19:07:10 -04:00
parent d05083bb18
commit 86cb3faf51
7 changed files with 8 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Assistant/WebApp.hs
View file

@ -11,7 +11,6 @@ module Assistant.WebApp where
import Assistant.WebApp.Types
import Assistant.Common
import Assistant.ThreadedMonad
import Assistant.DaemonStatus
import Utility.NotificationBroadcaster
import Utility.Yesod
@ -99,10 +98,8 @@ modifyWebAppState a = go =<< webAppState <$> getYesod
runAnnex :: forall sub a. a -> Annex a -> GHandler sub WebApp a
runAnnex fallback a = ifM (noAnnex <$> getYesod)
( return fallback
, go =<< getAssistantY threadState
, runAssistantY $ liftAnnex a
)
where
go st = liftIO $ runThreadState st a
waitNotifier :: forall sub. (DaemonStatus -> NotificationBroadcaster) -> NotificationId -> GHandler sub WebApp ()
waitNotifier selector nid = do