diff options
| -rw-r--r-- | Assistant/Threads/MountWatcher.hs | 14 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 11 insertions, 4 deletions
diff --git a/Assistant/Threads/MountWatcher.hs b/Assistant/Threads/MountWatcher.hs index fa7d4ec3c..2d80c5888 100644 --- a/Assistant/Threads/MountWatcher.hs +++ b/Assistant/Threads/MountWatcher.hs @@ -96,9 +96,10 @@ checkMountMonitor client = do ] return True where - startableservices = [gvfs] + startableservices = [gvfs, gvfsgdu] usableservices = startableservices ++ [kde] - gvfs = "org.gtk.Private.GduVolumeMonitor" + gvfs = "org.gtk.Private.RemoteVolumeMonitor" + gvfsgdu = "org.gtk.Private.GduVolumeMonitor" kde = "org.kde.DeviceNotifications" startOneService :: Client -> [ServiceName] -> Assistant Bool @@ -118,10 +119,15 @@ startOneService client (x:xs) = do {- Filter matching events recieved when drives are mounted and unmounted. -} mountChanged :: [MatchRule] -mountChanged = [gvfs True, gvfs False, kde, kdefallback] +mountChanged = [gvfs True, gvfsgdu False, kde, kdefallback] where - {- gvfs reliably generates this event whenever a + {- gdu gvfs reliably generates this event whenever a - drive is mounted/unmounted, whether automatically, or manually -} + gvfsgdu mount = matchAny + { matchInterface = Just "org.gtk.Private.RemoteVolumeMonitor" + , matchMember = Just $ if mount then "MountAdded" else "MountRemoved" + } + {- new gvfs -} gvfs mount = matchAny { matchInterface = Just "org.gtk.Private.RemoteVolumeMonitor" , matchMember = Just $ if mount then "MountAdded" else "MountRemoved" diff --git a/debian/changelog b/debian/changelog index b333cc160..e4da6a208 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ git-annex (3.20130108) UNRELEASED; urgency=low from connecting to the right localhost IP for the webapp. * webapp: Adjust longpoll code to work with recent versions of shakespeare-js. + * assistant: Support new gvfs dbus names used in Gnome 3.6. (untested) -- Joey Hess <joeyh@debian.org> Tue, 08 Jan 2013 12:37:38 -0400 |