From d9f26115c32c8df6865afc291d55b83b142c8428 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 20 Jul 2012 01:59:21 -0400
Subject: use dbus to activate GduVolumeMonitor if it's not already running

---
 Assistant/Threads/MountWatcher.hs | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

(limited to 'Assistant')

diff --git a/Assistant/Threads/MountWatcher.hs b/Assistant/Threads/MountWatcher.hs
index f1e33a99f..a6c15540a 100644
--- a/Assistant/Threads/MountWatcher.hs
+++ b/Assistant/Threads/MountWatcher.hs
@@ -22,6 +22,7 @@ import qualified Data.Set as S
 #if WITH_DBUS
 import DBus.Client
 import DBus
+import Data.Word (Word32)
 #else
 #warning Building without dbus support; will use mtab polling
 #endif
@@ -63,16 +64,34 @@ dbusThread st handle = (go =<< connectSession) `catchIO` onerr
 
 listClientNames :: Client -> IO [String]
 listClientNames client = do
-	reply <- call_ client (methodCall "/org/freedesktop/DBus" "org.freedesktop.DBus" "ListNames")
-		{ methodCallDestination = Just "org.freedesktop.DBus" }
+	reply <- callDBus client "ListNames" []
 	return $ fromMaybe [] $ fromVariant (methodReturnBody reply !! 0)
 
+callDBus :: Client -> MemberName -> [Variant] -> IO MethodReturn
+callDBus client name params = call_ client $
+	(methodCall "/org/freedesktop/DBus" "org.freedesktop.DBus" name)
+		{ methodCallDestination = Just "org.freedesktop.DBus"
+		, methodCallBody = params
+		}
+
 {- Examine the list of clients connected to dbus, to see if there
- - are any we can use to monitor mounts. -}
+ - are any we can use to monitor mounts. If not, will attempt to start one. -}
 checkMountMonitor :: Client -> IO Bool
-checkMountMonitor client = any (`elem` knownclients) <$> listClientNames client
+checkMountMonitor client = ifM isrunning
+	( return True
+	, startclient knownclients
+	)
 	where
+		isrunning = any (`elem` knownclients) <$> listClientNames client
 		knownclients = ["org.gtk.Private.GduVolumeMonitor"]
+		startclient [] = return False
+		startclient (c:cs) = do
+			_ <- callDBus client "StartServiceByName"
+				[toVariant c, toVariant (0 :: Word32)]
+			ifM isrunning
+				( return True
+				, startclient cs
+				)
 
 {- Filter matching events recieved when drives are mounted. -}	
 mountAdded ::MatchRule
-- 
cgit v1.2.3