diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-03-18 12:17:33 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-03-18 12:17:33 -0400 |
| commit | 76fa21235015727ec53e63a44ec833212005153b (patch) | |
| tree | ba073a552aa62fcdb1770720fbbce74cf20e2576 /Assistant | |
| parent | 35f138cc957c51a36949d146c678e37a4e677173 (diff) | |
unify two similar alerts
Diffstat (limited to 'Assistant')
| -rw-r--r-- | Assistant/Alert.hs | 4 | ||||
| -rw-r--r-- | Assistant/Sync.hs | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/Assistant/Alert.hs b/Assistant/Alert.hs index 40c37a94a..4e733428a 100644 --- a/Assistant/Alert.hs +++ b/Assistant/Alert.hs @@ -239,10 +239,6 @@ commitAlert = activityAlert Nothing showRemotes :: [Remote] -> TenseChunk showRemotes = UnTensed . T.unwords . map (T.pack . Remote.name) -pushAlert :: [Remote] -> Alert -pushAlert rs = activityAlert Nothing - [Tensed "Syncing" "Synced", "with", showRemotes rs] - pushRetryAlert :: [Remote] -> Alert pushRetryAlert rs = activityAlert (Just $ tenseWords [Tensed "Retrying" "Retried", "sync"]) diff --git a/Assistant/Sync.hs b/Assistant/Sync.hs index 46fc0c309..39c30d108 100644 --- a/Assistant/Sync.hs +++ b/Assistant/Sync.hs @@ -104,7 +104,7 @@ pushToRemotes notifypushes remotes = do let go = pushToRemotes' now notifypushes remotes if null nonxmppremotes then go - else alertWhile (pushAlert nonxmppremotes) go + else alertWhile (syncAlert nonxmppremotes) go pushToRemotes' :: UTCTime -> Bool -> [Remote] -> Assistant Bool pushToRemotes' now notifypushes remotes = do (g, branch, u) <- liftAnnex $ do |