assistant: Support new gvfs dbus names used in Gnome 3.6. (untested)
This commit is contained in:
parent
2c60da56f1
commit
d22d06a84a
2 changed files with 11 additions and 4 deletions
|
@ -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"
|
||||
|
|
1
debian/changelog
vendored
1
debian/changelog
vendored
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue