[Pkg-owncloud-commits] [owncloud-client] 53/218: FolderDefinition: Escape the alias of a folder before writing to the config

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit d853b4f0837938398e02ebf7d9c279d56fa91a27
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Wed Sep 2 16:05:58 2015 +0200

    FolderDefinition: Escape the alias of a folder before writing to the config
    
    Issue #3707
---
 src/gui/folder.cpp    | 4 ++--
 src/gui/folderman.cpp | 2 +-
 src/gui/folderman.h   | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
index ea9056d..69f76de 100644
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@ -1142,7 +1142,7 @@ void Folder::slotAboutToRemoveAllFiles(SyncFileItem::Direction, bool *cancel)
 
 void FolderDefinition::save(QSettings& settings, const FolderDefinition& folder)
 {
-    settings.beginGroup(folder.alias);
+    settings.beginGroup(FolderMan::escapeAlias(folder.alias));
     settings.setValue(QLatin1String("localPath"), folder.localPath);
     settings.setValue(QLatin1String("targetPath"), folder.targetPath);
     settings.setValue(QLatin1String("paused"), folder.paused);
@@ -1154,7 +1154,7 @@ bool FolderDefinition::load(QSettings& settings, const QString& alias,
                             FolderDefinition* folder)
 {
     settings.beginGroup(alias);
-    folder->alias = alias;
+    folder->alias = FolderMan::unescapeAlias(alias);
     folder->localPath = settings.value(QLatin1String("localPath")).toString();
     folder->targetPath = settings.value(QLatin1String("targetPath")).toString();
     folder->paused = settings.value(QLatin1String("paused")).toBool();
diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp
index 3b18a9a..3d0428b 100644
--- a/src/gui/folderman.cpp
+++ b/src/gui/folderman.cpp
@@ -321,7 +321,7 @@ SocketApi *FolderMan::socketApi()
     return this->_socketApi;
 }
 
-QString FolderMan::unescapeAlias( const QString& alias ) const
+QString FolderMan::unescapeAlias( const QString& alias )
 {
     QString a(alias);
 
diff --git a/src/gui/folderman.h b/src/gui/folderman.h
index 3244f72..013ce83 100644
--- a/src/gui/folderman.h
+++ b/src/gui/folderman.h
@@ -86,6 +86,7 @@ public:
     // Escaping of the alias which is used in QSettings AND the file
     // system, thus need to be escaped.
     static QString escapeAlias( const QString& );
+    static QString unescapeAlias( const QString& );
 
     SocketApi *socketApi();
 
@@ -193,8 +194,6 @@ private:
     // restarts the application (Linux only)
     void restartApplication();
 
-    QString unescapeAlias( const QString& ) const;
-
     QSet<Folder*>  _disabledFolders;
     Folder::Map    _folderMap;
     QString        _folderConfigPath;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git