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

Merge remote-tracking branch 'gueux/plasma5'

Browse source
This commit is contained in:
Joey Hess 2017-10-18 13:33:33 -04:00
commit aa5c76c6cd
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Assistant/Install.hs
View file

@ -107,7 +107,8 @@ installFileManagerHooks program = do
-- KDE -- KDE
home <- myHomeDir home <- myHomeDir
let kdeServiceMenusdir = home </> ".kde" </> "share" </> "kde4" </> "services" </> "ServiceMenus" userdata <- userDataDir
let kdeServiceMenusdir = userdata </> "kservices5" </> "ServiceMenus"
createDirectoryIfMissing True kdeServiceMenusdir createDirectoryIfMissing True kdeServiceMenusdir
writeFile (kdeServiceMenusdir </> "git-annex.desktop") writeFile (kdeServiceMenusdir </> "git-annex.desktop")
(kdeDesktopFile actions) (kdeDesktopFile actions)

2
doc/tips/file_manager_integration.mdwn
View file

@ -22,7 +22,7 @@ Even more recent git-annex comes with built-in integration with Konqueror.
[[!img assistant/konquerormenu.png]] [[!img assistant/konquerormenu.png]]
This is set up by git-annex creating a This is set up by git-annex creating a
`~/.kde/share/kde4/services/ServiceMenus/git-annex.desktop file. `$XDG_DATA_HOME/kservices5/ServiceMenus/git-annex.desktop` file.
## Xfce (Thunar) ## Xfce (Thunar)