diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-04-22 16:23:41 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-04-22 16:23:41 -0400 |
| commit | 8112d0a6978caad2b2852b41b8eb284f9a5d4605 (patch) | |
| tree | 200a9291c299c26650f7dfa03f7253f2c2c6ef8b /Assistant | |
| parent | 05abf0e4e99e7a146505da09d275c56fd0aafad4 (diff) | |
also drop old dbus compat
Diffstat (limited to 'Assistant')
| -rw-r--r-- | Assistant/Threads/MountWatcher.hs | 4 | ||||
| -rw-r--r-- | Assistant/Threads/NetWatcher.hs | 8 |
2 files changed, 0 insertions, 12 deletions
diff --git a/Assistant/Threads/MountWatcher.hs b/Assistant/Threads/MountWatcher.hs index 023af53cb..3ccdd1adc 100644 --- a/Assistant/Threads/MountWatcher.hs +++ b/Assistant/Threads/MountWatcher.hs @@ -63,11 +63,7 @@ dbusThread urlrenderer = do wasmounted <- liftIO $ swapMVar mvar nowmounted handleMounts urlrenderer wasmounted nowmounted liftIO $ forM_ mountChanged $ \matcher -> -#if MIN_VERSION_dbus(0,10,7) void $ addMatch client matcher handleevent -#else - listen client matcher handleevent -#endif , do liftAnnex $ warning "No known volume monitor available through dbus; falling back to mtab polling" diff --git a/Assistant/Threads/NetWatcher.hs b/Assistant/Threads/NetWatcher.hs index ad3a87a91..07ccdaf24 100644 --- a/Assistant/Threads/NetWatcher.hs +++ b/Assistant/Threads/NetWatcher.hs @@ -112,11 +112,7 @@ checkNetMonitor client = do -} listenNMConnections :: Client -> (Bool -> IO ()) -> IO () listenNMConnections client setconnected = -#if MIN_VERSION_dbus(0,10,7) void $ addMatch client matcher -#else - listen client matcher -#endif $ \event -> mapM_ handleevent (map dictionaryItems $ mapMaybe fromVariant $ signalBody event) where @@ -166,11 +162,7 @@ listenWicdConnections client setconnected = do | any (== wicd_disconnected) status = setconnected False | otherwise = noop match matcher a = -#if MIN_VERSION_dbus(0,10,7) void $ addMatch client matcher a -#else - listen client matcher a -#endif #endif handleConnection :: Assistant () |