diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-10-18 13:33:33 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-10-18 13:33:33 -0400 |
| commit | 491f69c9baf0e24039b9a5eda553018644bc9a32 (patch) | |
| tree | e71f3feb63a7676b7ee739453240d9b9eb0c9e89 | |
| parent | c50cc966a9365a5056e63c0087751d9636acb0ab (diff) | |
| parent | 68fbef5e5663bf7850cab4afdd1addbe9a06c2f8 (diff) | |
Merge remote-tracking branch 'gueux/plasma5'
| -rw-r--r-- | Assistant/Install.hs | 3 | ||||
| -rw-r--r-- | doc/tips/file_manager_integration.mdwn | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Assistant/Install.hs b/Assistant/Install.hs index 175888e9a..aac2a50ce 100644 --- a/Assistant/Install.hs +++ b/Assistant/Install.hs @@ -107,7 +107,8 @@ installFileManagerHooks program = do -- KDE home <- myHomeDir - let kdeServiceMenusdir = home </> ".kde" </> "share" </> "kde4" </> "services" </> "ServiceMenus" + userdata <- userDataDir + let kdeServiceMenusdir = userdata </> "kservices5" </> "ServiceMenus" createDirectoryIfMissing True kdeServiceMenusdir writeFile (kdeServiceMenusdir </> "git-annex.desktop") (kdeDesktopFile actions) diff --git a/doc/tips/file_manager_integration.mdwn b/doc/tips/file_manager_integration.mdwn index cd4218ff2..36e7add68 100644 --- a/doc/tips/file_manager_integration.mdwn +++ b/doc/tips/file_manager_integration.mdwn @@ -22,7 +22,7 @@ Even more recent git-annex comes with built-in integration with Konqueror. [[!img assistant/konquerormenu.png]] 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) |