diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-04-29 15:53:16 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-04-29 15:53:16 -0400 |
| commit | 97c488a31cc63005e17536208df1f4f25ed866a6 (patch) | |
| tree | f2c1663447fb8cac22b167fbbe4058e3bbcd5943 | |
| parent | 81953d060c43df2a3567baa2b0f3f2c592572a63 (diff) | |
Improve integration with KDE's file manager to work with dolphin version 14.12.3 while still being compatable with 4.14.2. Thanks, silvio.
| -rw-r--r-- | Assistant/Install.hs | 6 | ||||
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | doc/bugs/dolphin_integration_file_is_broken.mdwn | 3 | ||||
| -rw-r--r-- | doc/bugs/dolphin_integration_file_is_broken/comment_3_89c166c4e44380b8f354f2c6b5e42fad._comment | 10 |
4 files changed, 20 insertions, 2 deletions
diff --git a/Assistant/Install.hs b/Assistant/Install.hs index 6da6d2389..00d719bec 100644 --- a/Assistant/Install.hs +++ b/Assistant/Install.hs @@ -145,10 +145,12 @@ installFileManagerHooks program = do , "Name=" ++ command , "Icon=git-annex" , unwords - [ "Exec=sh -c 'cd \"$(dirname '%U')\" &&" + [ "Exec=sh -c 'cd \"$(dirname \"$1\")\" &&" , program , command - , "--notify-start --notify-finish -- %U'" + , "--notify-start --notify-finish -- \"$1\"'" + , "false" -- this becomes $0 in sh, so unused + , "%f" ] ] #else diff --git a/debian/changelog b/debian/changelog index ac96777ac..2db52813e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,9 @@ git-annex (5.20150421) UNRELEASED; urgency=medium (Needs git 1.8.4 or newer.) * import: Don't stop entire import when one file fails due to being gitignored or conflicting with something in the work tree. + * Improve integration with KDE's file manager to work with dolphin + version 14.12.3 while still being compatable with 4.14.2. + Thanks, silvio. -- Joey Hess <id@joeyh.name> Tue, 21 Apr 2015 15:54:10 -0400 diff --git a/doc/bugs/dolphin_integration_file_is_broken.mdwn b/doc/bugs/dolphin_integration_file_is_broken.mdwn index 4b0e11cae..2f2fc1c4e 100644 --- a/doc/bugs/dolphin_integration_file_is_broken.mdwn +++ b/doc/bugs/dolphin_integration_file_is_broken.mdwn @@ -32,3 +32,6 @@ or simply # End of transcript or log. """]] + +> [[fixed|done]]; confirmed the new version still works on filenames with +> spaces in them. --[[Joey]] diff --git a/doc/bugs/dolphin_integration_file_is_broken/comment_3_89c166c4e44380b8f354f2c6b5e42fad._comment b/doc/bugs/dolphin_integration_file_is_broken/comment_3_89c166c4e44380b8f354f2c6b5e42fad._comment new file mode 100644 index 000000000..fdbc3beb1 --- /dev/null +++ b/doc/bugs/dolphin_integration_file_is_broken/comment_3_89c166c4e44380b8f354f2c6b5e42fad._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 3""" + date="2015-04-29T19:37:42Z" + content=""" +So a much newer version than the one in Debian yet.. + +I tried your command line with the old version in Debian, and it seems to +work ok, so thanks for the improvement! +"""]] |