[Pkg-owncloud-commits] [owncloud-client] 293/332: Config: Fix loading of configuration

[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 c313cc02f215adaa0e052fad44f849ef94db878c
Author: Markus Goetz <markus at woboq.com>
Date:   Tue Aug 5 00:34:24 2014 +0200

    Config: Fix loading of configuration
    
    There is a strange bug with Qt, we need to always set the application name, then
    we can generate the proper config path.
---
 doc/ocdoc                       | 2 +-
 src/mirall/mirallconfigfile.cpp | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/ocdoc b/doc/ocdoc
index c612df3..a8fc638 160000
--- a/doc/ocdoc
+++ b/doc/ocdoc
@@ -1 +1 @@
-Subproject commit c612df399e3c775a2f9db1dc5e39d25920ab467b
+Subproject commit a8fc638c26dd47925e66f05fb87cface5dbbbd81
diff --git a/src/mirall/mirallconfigfile.cpp b/src/mirall/mirallconfigfile.cpp
index 8988a05..a791a06 100644
--- a/src/mirall/mirallconfigfile.cpp
+++ b/src/mirall/mirallconfigfile.cpp
@@ -69,6 +69,9 @@ bool    MirallConfigFile::_askedUser = false;
 
 MirallConfigFile::MirallConfigFile()
 {
+    // QDesktopServices uses the application name to create a config path
+    qApp->setApplicationName( Theme::instance()->appNameGUI() );
+
     QSettings::setDefaultFormat(QSettings::IniFormat);
 
     const QString config = configFile();
@@ -77,7 +80,7 @@ MirallConfigFile::MirallConfigFile()
     QSettings settings(config, QSettings::IniFormat);
     settings.beginGroup( defaultConnection() );
 
-    // qDebug() << "Loading config: " << config << " (URL is " << settings.value("url").toString() << ")";
+    // qDebug() << Q_FUNC_INFO << "Loading config: " << config << " (URL is " << settings.value("url").toString() << ")";
 }
 
 void MirallConfigFile::setConfDir(const QString &value)
@@ -243,9 +246,6 @@ QString MirallConfigFile::excludeFile(Scope scope) const
 
 QString MirallConfigFile::configFile() const
 {
-    if( qApp->applicationName().isEmpty() ) {
-        qApp->setApplicationName( Theme::instance()->appNameGUI() );
-    }
     return configPath() + Theme::instance()->configFileName();
 }
 

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