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

Merge branch 'assistant' into assistant-longpolling-rewrite

Browse source
This commit is contained in:
Joey Hess 2012-07-30 19:40:16 -04:00
commit 9b1ed7a720
2 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Assistant/Alert.hs
View file

@ -174,13 +174,6 @@ activityAlert header message = baseActivityAlert
startupScanAlert :: Alert
startupScanAlert = activityAlert Nothing "Performing startup scan"
runningAlert :: Alert
runningAlert = baseActivityAlert
{ alertClass = Success
, alertMessage = StringAlert "Running"
, alertPriority = Pinned
}
pushAlert :: [Remote] -> Alert
pushAlert rs = activityAlert Nothing $
"Syncing with " ++ unwords (map Remote.name rs)

2
Assistant/Threads/Watcher.hs
View file

@ -87,8 +87,6 @@ startupScan st dstatus scanner = do
modifyDaemonStatus_ dstatus $ \s -> s { scanComplete = True }
return (True, r)
void $ addAlert dstatus runningAlert
return r