[Pkg-owncloud-commits] [owncloud-client] 66/83: Allow to set a smaller timeout value in the config file

[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 3d2a2df86f7611624396c5dba1330d9f5f7959c4
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Wed May 28 16:28:22 2014 +0200

    Allow to set a smaller timeout value in the config file
    
    Added to debug #1724
---
 src/mirall/mirallconfigfile.cpp   | 7 +++++++
 src/mirall/mirallconfigfile.h     | 2 ++
 src/mirall/owncloudpropagator.cpp | 5 ++++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/mirall/mirallconfigfile.cpp b/src/mirall/mirallconfigfile.cpp
index 48f806e..a547464 100644
--- a/src/mirall/mirallconfigfile.cpp
+++ b/src/mirall/mirallconfigfile.cpp
@@ -47,6 +47,7 @@ static const char monoIconsC[] = "monoIcons";
 static const char optionalDesktopNoficationsC[] = "optionalDesktopNotifications";
 static const char skipUpdateCheckC[] = "skipUpdateCheck";
 static const char geometryC[] = "geometry";
+static const char timeoutC[] = "timeout";
 
 static const char proxyHostC[] = "Proxy/host";
 static const char proxyTypeC[] = "Proxy/type";
@@ -103,6 +104,12 @@ bool MirallConfigFile::optionalDesktopNotifications() const
     return settings.value(QLatin1String(optionalDesktopNoficationsC), true).toBool();
 }
 
+int MirallConfigFile::timeout() const
+{
+    QSettings settings(configFile(), QSettings::IniFormat);
+    return settings.value(QLatin1String(timeoutC), 300).toInt(); // default to 5 min
+}
+
 void MirallConfigFile::setOptionalDesktopNotifications(bool show)
 {
     QSettings settings(configFile(), QSettings::IniFormat);
diff --git a/src/mirall/mirallconfigfile.h b/src/mirall/mirallconfigfile.h
index c3769a9..8b7423f 100644
--- a/src/mirall/mirallconfigfile.h
+++ b/src/mirall/mirallconfigfile.h
@@ -97,6 +97,8 @@ public:
     bool optionalDesktopNotifications() const;
     void setOptionalDesktopNotifications(bool show);
 
+    int timeout() const;
+
     void saveGeometry(QWidget *w);
     void restoreGeometry(QWidget *w);
 
diff --git a/src/mirall/owncloudpropagator.cpp b/src/mirall/owncloudpropagator.cpp
index 888f866..b212c4c 100644
--- a/src/mirall/owncloudpropagator.cpp
+++ b/src/mirall/owncloudpropagator.cpp
@@ -19,6 +19,7 @@
 #include "propagator_qnam.h"
 #include "propagatorjobs.h"
 #include "propagator_legacy.h"
+#include "mirall/mirallconfigfile.h"
 #include "mirall/utility.h"
 
 #ifdef Q_OS_WIN
@@ -295,8 +296,10 @@ int OwncloudPropagator::httpTimeout()
     if (!timeout) {
         timeout = qgetenv("OWNCLOUD_TIMEOUT").toUInt();
         if (timeout == 0) {
-            timeout = 300; // default to 300 secs
+            MirallConfigFile cfg;
+            timeout = cfg.timeout();
         }
+
     }
     return timeout;
 }

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