mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

tweak

Browse source
This commit is contained in:
Joey Hess 2012-10-29 14:30:10 -04:00
parent 67ce7929a5
commit 0ffce4a942
2 changed files with 26 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Assistant/Threads/MountWatcher.hs
View file

@ -88,7 +88,7 @@ checkMountMonitor client = do
running <- filter (`elem` usableservices) running <- filter (`elem` usableservices)
<$> liftIO (listServiceNames client) <$> liftIO (listServiceNames client)
case running of case running of
[] -> liftIO $ startOneService client startableservices [] -> startOneService client startableservices
(service:_) -> do (service:_) -> do
debug [ "Using running DBUS service" debug [ "Using running DBUS service"
, service , service
@ -101,15 +101,15 @@ checkMountMonitor client = do
gvfs = "org.gtk.Private.GduVolumeMonitor" gvfs = "org.gtk.Private.GduVolumeMonitor"
kde = "org.kde.DeviceNotifications" kde = "org.kde.DeviceNotifications"
startOneService :: Client -> [ServiceName] -> IO Bool startOneService :: Client -> [ServiceName] -> Assistant Bool
startOneService _ [] = return False startOneService _ [] = return False
startOneService client (x:xs) = do startOneService client (x:xs) = do
_ <- callDBus client "StartServiceByName" _ <- liftIO $ callDBus client "StartServiceByName"
[toVariant x, toVariant (0 :: Word32)] [toVariant x, toVariant (0 :: Word32)]
ifM (elem x <$> listServiceNames client) ifM (liftIO $ elem x <$> listServiceNames client)
( do ( do
brokendebug thisThread [ "Started DBUS service" debug
, x [ "Started DBUS service", x
, "to monitor mount events." , "to monitor mount events."
] ]
return True return True

1
Assistant/Threads/WebApp.hs
View file

@ -83,7 +83,6 @@ webAppThread assistantdata urlrenderer noannex postfirstrun onstartup = thread $
(relHome =<< absPath (relHome =<< absPath
=<< runThreadState (threadState assistantdata) (fromRepo repoPath)) =<< runThreadState (threadState assistantdata) (fromRepo repoPath))
go port webapp htmlshim urlfile = do go port webapp htmlshim urlfile = do
brokendebug thisThread ["running on port", show port]
let url = myUrl webapp port let url = myUrl webapp port
maybe noop (`writeFile` url) urlfile maybe noop (`writeFile` url) urlfile
writeHtmlShim url htmlshim writeHtmlShim url htmlshim