diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-11-11 13:36:26 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-11-11 13:36:26 -0300 |
commit | a82a20b31c92da07e81852b949f1a285a2264a58 (patch) | |
tree | 3f675840e96428a9808e83a7b0611a929c0d6ab9 /libre/kdelibs-libre/fix-save-path.patch | |
parent | 01be72ba37c7a000cff66e782a0a7dc7f81e998f (diff) | |
parent | 7d749da6d40997117dcd137cf5084192ad76572b (diff) | |
download | abslibre-a82a20b31c92da07e81852b949f1a285a2264a58.tar.gz abslibre-a82a20b31c92da07e81852b949f1a285a2264a58.tar.bz2 abslibre-a82a20b31c92da07e81852b949f1a285a2264a58.zip |
Merge branch 'master' of ssh://gparabola/srv/git/abslibre
Diffstat (limited to 'libre/kdelibs-libre/fix-save-path.patch')
-rw-r--r-- | libre/kdelibs-libre/fix-save-path.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/libre/kdelibs-libre/fix-save-path.patch b/libre/kdelibs-libre/fix-save-path.patch new file mode 100644 index 000000000..1a00221a7 --- /dev/null +++ b/libre/kdelibs-libre/fix-save-path.patch @@ -0,0 +1,27 @@ +commit 793e2a69f8aa193b60494b03d51c5fd44373c0e7 +Author: Jonathan Marten <jjm@keelhaul.me.uk> +Date: Wed Nov 7 12:45:03 2012 +0000 + + Fix regression: specified or remembered save path is not used + + As requested on review https://git.reviewboard.kde.org/r/106475/ + +diff --git a/kfile/kfilewidget.cpp b/kfile/kfilewidget.cpp +index 65deca2..e755aae 100644 +--- a/kfile/kfilewidget.cpp ++++ b/kfile/kfilewidget.cpp +@@ -2593,8 +2593,12 @@ KUrl KFileWidget::getStartUrl( const KUrl& startDir, + } + else // not special "kfiledialog" URL + { +- if (!startDir.isRelative()) // has directory, maybe with filename +- { ++ // We can use startDir as the starting directory if either: ++ // (a) it has a directory part, or ++ // (b) there is a scheme (protocol), and it is not just "file". ++ if (!startDir.directory().isEmpty() || ++ (!startDir.scheme().isEmpty() && !startDir.isLocalFile())) ++ { // can use start directory + ret = startDir; // will be checked by stat later + // If we won't be able to list it (e.g. http), then use default + if ( !KProtocolManager::supportsListing( ret ) ) { |