summaryrefslogtreecommitdiff
path: root/Assistant/Threads
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-08-08 13:55:09 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-08-08 13:55:09 -0400
commite90f4c9b7c15c7a86b099e2f76d02237b78054e7 (patch)
treea10e20f72f44c9de32eea8a698ce0e0f9367d758 /Assistant/Threads
parentc833c933b4638cd02bb5e6d49ec051515d7977a4 (diff)
fix build warning
Diffstat (limited to 'Assistant/Threads')
-rw-r--r--Assistant/Threads/NetWatcher.hs8
1 files changed, 4 insertions, 4 deletions
diff --git a/Assistant/Threads/NetWatcher.hs b/Assistant/Threads/NetWatcher.hs
index f8c456aac..09cddd324 100644
--- a/Assistant/Threads/NetWatcher.hs
+++ b/Assistant/Threads/NetWatcher.hs
@@ -117,7 +117,7 @@ listenNMConnections client setconnected =
#else
listen client matcher
#endif
- $ \event -> mapM_ handle
+ $ \event -> mapM_ handleevent
(map dictionaryItems $ mapMaybe fromVariant $ signalBody event)
where
matcher = matchAny
@@ -128,7 +128,7 @@ listenNMConnections client setconnected =
nm_activatingconnection_key = toVariant ("ActivatingConnection" :: String)
noconnections = Just $ toVariant $ toVariant ([] :: [ObjectPath])
rootconnection = Just $ toVariant $ toVariant $ objectPath_ "/"
- handle m
+ handleevent m
| lookup nm_active_connections_key m == noconnections =
setconnected False
| lookup nm_activatingconnection_key m == rootconnection =
@@ -150,7 +150,7 @@ listenWicdConnections client setconnected = do
match connmatcher $ \event ->
when (any (== wicd_success) (signalBody event)) $
setconnected True
- match statusmatcher $ \event -> handle (signalBody event)
+ match statusmatcher $ \event -> handleevent (signalBody event)
where
connmatcher = matchAny
{ matchInterface = Just "org.wicd.daemon"
@@ -162,7 +162,7 @@ listenWicdConnections client setconnected = do
}
wicd_success = toVariant ("success" :: String)
wicd_disconnected = toVariant [toVariant ("" :: String)]
- handle status
+ handleevent status
| any (== wicd_disconnected) status = setconnected False
| otherwise = noop
match matcher a =