avoid build warning from new dbus

This commit is contained in:
Joey Hess 2014-04-26 20:18:33 -03:00
parent b188561ba2
commit f5b1c3841e

View file

@ -112,7 +112,12 @@ checkNetMonitor client = do
-} -}
listenNMConnections :: Client -> (Bool -> IO ()) -> IO () listenNMConnections :: Client -> (Bool -> IO ()) -> IO ()
listenNMConnections client setconnected = listenNMConnections client setconnected =
listen client matcher $ \event -> mapM_ handle #if MIN_VERSION_dbus(0,10,7)
void $ addMatch client matcher
#else
listen client matcher
#endif
$ \event -> mapM_ handle
(map dictionaryItems $ mapMaybe fromVariant $ signalBody event) (map dictionaryItems $ mapMaybe fromVariant $ signalBody event)
where where
matcher = matchAny matcher = matchAny
@ -142,10 +147,10 @@ listenNMConnections client setconnected =
-} -}
listenWicdConnections :: Client -> (Bool -> IO ()) -> IO () listenWicdConnections :: Client -> (Bool -> IO ()) -> IO ()
listenWicdConnections client setconnected = do listenWicdConnections client setconnected = do
listen client connmatcher $ \event -> match connmatcher $ \event ->
when (any (== wicd_success) (signalBody event)) $ when (any (== wicd_success) (signalBody event)) $
setconnected True setconnected True
listen client statusmatcher $ \event -> handle (signalBody event) match statusmatcher $ \event -> handle (signalBody event)
where where
connmatcher = matchAny connmatcher = matchAny
{ matchInterface = Just "org.wicd.daemon" { matchInterface = Just "org.wicd.daemon"
@ -160,7 +165,12 @@ listenWicdConnections client setconnected = do
handle status handle status
| any (== wicd_disconnected) status = setconnected False | any (== wicd_disconnected) status = setconnected False
| otherwise = noop | otherwise = noop
match matcher a =
#if MIN_VERSION_dbus(0,10,7)
void $ addMatch client matcher a
#else
listen client matcher a
#endif
#endif #endif
handleConnection :: Assistant () handleConnection :: Assistant ()