[Digikam-devel] [Bug 271651] 2.0 beta4 can't use network shares

[Gilles Caulier]

https://bugs.kde.org/show_bug.cgi?id=271651


Gilles Caulier <caulier.gilles at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |caulier.gilles at gmail.com




--- Comment #1 from Gilles Caulier <caulier gilles gmail com>  2011-04-25 21:54:00 ---
Git commit 7adb7184f9f9c8c82eeb0d5b094ac8fb91018d7c by Matthias Welwarsky.
Committed on 25/04/2011 at 14:21.
Pushed by welwarsky into branch 'master'.

CollectionManager: fix for collections on network shares

QUrl default constructor expects an unencoded URL. If an encoded
URL is used, the '%' is again encoded and the resulting URL
is unusable. AlbumRootLocation::identifier seems to be already encoded,
therefore use the proper QUrl::fromEncoded() method.

Without this fix, existing collections on network shares are always
marked unavailable and new collections can not be generated.

Signed-off-by: Matthias Welwarsky <matze at welwarsky.de>

M  +1    -1    libs/database/collectionmanager.cpp

http://commits.kde.org/digikam/7adb7184f9f9c8c82eeb0d5b094ac8fb91018d7c

diff --git a/libs/database/collectionmanager.cpp
b/libs/database/collectionmanager.cpp
index e2a4bbe..40e3e67 100644
--- a/libs/database/collectionmanager.cpp
+++ b/libs/database/collectionmanager.cpp
@@ -450,7 +450,7 @@ QString CollectionManagerPrivate::pathFromIdentifier(const
AlbumRootLocation* lo
 QStringList
CollectionManagerPrivate::networkShareMountPathsFromIdentifier(const
AlbumRootLocation* location)
 {
    // using a QUrl because KUrl cannot handle duplicate query items
-    QUrl url(location->identifier);
+    QUrl url = QUrl::fromEncoded(location->identifier.toLocal8Bit());

    if (url.scheme() != "networkshareid")
    {

-- 
Configure bugmail: https://bugs.kde.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.