[Pkg-owncloud-commits] [owncloud-client] 119/470: Settings: Hide update info if skipUpdateCheck #4397

[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 17003cec198884c4072e2411226ff52de58aa16e
Author: Christian Kamm <mail at ckamm.de>
Date:   Thu Mar 3 13:20:10 2016 +0100

    Settings: Hide update info if skipUpdateCheck #4397
    
    (cherry picked from commit 93de378fb21e934d324d621f66eec98e53f1637a)
---
 src/gui/generalsettings.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/gui/generalsettings.cpp b/src/gui/generalsettings.cpp
index a0d8598..d4d41c5 100644
--- a/src/gui/generalsettings.cpp
+++ b/src/gui/generalsettings.cpp
@@ -109,7 +109,12 @@ void GeneralSettings::loadMiscSettings()
 
 void GeneralSettings::slotUpdateInfo()
 {
-    if (OCUpdater *updater = dynamic_cast<OCUpdater*>(Updater::instance())) {
+    OCUpdater *updater = dynamic_cast<OCUpdater*>(Updater::instance());
+    if (ConfigFile().skipUpdateCheck()) {
+        updater = 0; // don't show update info if updates are disabled
+    }
+
+    if (updater) {
         connect(updater, SIGNAL(downloadStateChanged()), SLOT(slotUpdateInfo()), Qt::UniqueConnection);
         connect(_ui->restartButton, SIGNAL(clicked()), updater, SLOT(slotStartInstaller()), Qt::UniqueConnection);
         connect(_ui->restartButton, SIGNAL(clicked()), qApp, SLOT(quit()), Qt::UniqueConnection);

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