summaryrefslogtreecommitdiff
path: root/Assistant
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-12-13 00:45:27 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-12-13 00:45:27 -0400
commit7db480af0f944ca0e6c062cd1243c63ad7f878d1 (patch)
tree21d7efe0b866dd7db1a5396a842652f49c676e84 /Assistant
parent94554782894ec6c26da3b46312d5d1d16d596458 (diff)
whitespace fixes
Diffstat (limited to 'Assistant')
-rw-r--r--Assistant/Alert.hs4
-rw-r--r--Assistant/Pushes.hs2
-rw-r--r--Assistant/Threads/TransferWatcher.hs6
-rw-r--r--Assistant/Threads/XMPPClient.hs2
4 files changed, 7 insertions, 7 deletions
diff --git a/Assistant/Alert.hs b/Assistant/Alert.hs
index e953e1a5e..c615b38ef 100644
--- a/Assistant/Alert.hs
+++ b/Assistant/Alert.hs
@@ -71,7 +71,7 @@ type AlertMap = M.Map AlertId Alert
{- Higher AlertId indicates a more recent alert. -}
newtype AlertId = AlertId Integer
- deriving (Read, Show, Eq, Ord)
+ deriving (Read, Show, Eq, Ord)
firstAlertId :: AlertId
firstAlertId = AlertId 0
@@ -247,7 +247,7 @@ syncAlert rs = baseActivityAlert
[Tensed "Syncing" "Synced", "with", showRemotes rs]
, alertData = []
, alertPriority = Low
- }
+ }
scanAlert :: [Remote] -> Alert
scanAlert rs = baseActivityAlert
diff --git a/Assistant/Pushes.hs b/Assistant/Pushes.hs
index 9765b6a42..54f31a84b 100644
--- a/Assistant/Pushes.hs
+++ b/Assistant/Pushes.hs
@@ -33,7 +33,7 @@ changeFailedPushMap a = do
v <- getAssistant failedPushMap
liftIO $ atomically $ store v . a . fromMaybe M.empty =<< tryTakeTMVar v
where
- {- tryTakeTMVar empties the TMVar; refill it only if
+ {- tryTakeTMVar empties the TMVar; refill it only if
- the modified map is not itself empty -}
store v m
| m == M.empty = noop
diff --git a/Assistant/Threads/TransferWatcher.hs b/Assistant/Threads/TransferWatcher.hs
index 6f040ba91..d2f7ebe14 100644
--- a/Assistant/Threads/TransferWatcher.hs
+++ b/Assistant/Threads/TransferWatcher.hs
@@ -47,7 +47,7 @@ type Handler = FilePath -> Assistant ()
-}
runHandler :: Handler -> FilePath -> Maybe FileStatus -> Assistant ()
runHandler handler file _filestatus =
- either (liftIO . print) (const noop) =<< tryIO <~> handler file
+ either (liftIO . print) (const noop) =<< tryIO <~> handler file
{- Called when there's an error with inotify. -}
onErr :: Handler
@@ -97,8 +97,8 @@ onDel file = case parseTransferFile file of
finished <- asIO2 finishedTransfer
void $ liftIO $ forkIO $ do
{- XXX race workaround delay. The location
- - log needs to be updated before finishedTransfer
- - runs. -}
+ - log needs to be updated before finishedTransfer
+ - runs. -}
threadDelay 10000000 -- 10 seconds
finished t minfo
diff --git a/Assistant/Threads/XMPPClient.hs b/Assistant/Threads/XMPPClient.hs
index df602df60..99b46dabb 100644
--- a/Assistant/Threads/XMPPClient.hs
+++ b/Assistant/Threads/XMPPClient.hs
@@ -55,7 +55,7 @@ xmppClient urlrenderer d = do
inAssistant = liftIO . liftAssistant
{- When the client exits, it's restarted;
- - if it keeps failing, back off to wait 5 minutes before
+ - if it keeps failing, back off to wait 5 minutes before
- trying it again. -}
retry client starttime = do
e <- client