summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Assistant/Install.hs3
-rw-r--r--CHANGELOG2
-rw-r--r--doc/tips/file_manager_integration.mdwn2
3 files changed, 5 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/CHANGELOG b/CHANGELOG
index 1d9a71188..6b07a8d06 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,6 +14,8 @@ git-annex (6.20171004) UNRELEASED; urgency=medium
* get -J/move -J/copy -J/mirror -J/sync -J: Avoid "transfer already in
progress" errors when two files use the same key.
* stack.yaml: Update to lts-9.9.
+ * Konqueror desktop file location changed to one used by plasma 5.
+ Thanks, FĂ©lix Sipma.
-- Joey Hess <id@joeyh.name> Sat, 07 Oct 2017 14:11:00 -0400
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)