diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-07-30 19:40:16 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-07-30 19:40:16 -0400 |
| commit | 9b1ed7a7200e087ecf3cfa8288a1197da0751136 (patch) | |
| tree | 8a48fc5b2b6c68295389e39621dead65c6939ef7 | |
| parent | 2e54a611c7610b0b363d01b70536e29a09f4fc65 (diff) | |
| parent | 5de897e8d70d82effe389fddf4b8be287b5f738f (diff) | |
Merge branch 'assistant' into assistant-longpolling-rewrite
| -rw-r--r-- | Assistant/Alert.hs | 7 | ||||
| -rw-r--r-- | Assistant/Threads/Watcher.hs | 2 |
2 files changed, 0 insertions, 9 deletions
diff --git a/Assistant/Alert.hs b/Assistant/Alert.hs index 54192aae6..9a0bba8ae 100644 --- a/Assistant/Alert.hs +++ b/Assistant/Alert.hs @@ -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) diff --git a/Assistant/Threads/Watcher.hs b/Assistant/Threads/Watcher.hs index 51dc57263..8ba015b19 100644 --- a/Assistant/Threads/Watcher.hs +++ b/Assistant/Threads/Watcher.hs @@ -87,8 +87,6 @@ startupScan st dstatus scanner = do modifyDaemonStatus_ dstatus $ \s -> s { scanComplete = True } return (True, r) - - void $ addAlert dstatus runningAlert return r |