diff options
| author | Márcio Alexandre Silva Delgado <coadde@lavabit.com> | 2013-03-07 22:35:35 -0200 |
|---|---|---|
| committer | Márcio Alexandre Silva Delgado <coadde@lavabit.com> | 2013-03-07 22:35:35 -0200 |
| commit | d1d015ae412926ef68122db65a05e6d608d03e13 (patch) | |
| tree | 15075ec356de928a0a0a603ca6b4a3577bc495db /libre/kdelibs-libre/fix-save-path.patch | |
| parent | b174609cfe9149b41c40162af184800fc7c66c23 (diff) | |
| parent | 63ed17d53e366deeb4b186b3c165964ab31165b0 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/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, 0 insertions, 27 deletions
diff --git a/libre/kdelibs-libre/fix-save-path.patch b/libre/kdelibs-libre/fix-save-path.patch deleted file mode 100644 index 1a00221a7..000000000 --- a/libre/kdelibs-libre/fix-save-path.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 ) ) { |