[Pkg-owncloud-commits] [owncloud-client] 25/120: Fix regression in PassiveUpdateNotifier

[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 385c3882a79bb9cd237f9895da14b83270d9ca34
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Mon Aug 10 14:25:38 2015 +0200

    Fix regression in PassiveUpdateNotifier
    
    When overriding backgroundCheckForUpdates(), also call the original
    implementation.
---
 src/gui/updater/ocupdater.cpp | 3 +++
 src/gui/updater/ocupdater.h   | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/gui/updater/ocupdater.cpp b/src/gui/updater/ocupdater.cpp
index 1313470..051d3ca 100644
--- a/src/gui/updater/ocupdater.cpp
+++ b/src/gui/updater/ocupdater.cpp
@@ -431,6 +431,7 @@ PassiveUpdateNotifier::PassiveUpdateNotifier(const QUrl &url, QObject *parent)
 
 void PassiveUpdateNotifier::backgroundCheckForUpdate()
 {
+
     if( Utility::isLinux() ) {
         // on linux, check if the installed binary is still the same version
         // as the one that is running. If not, restart if possible.
@@ -440,6 +441,8 @@ void PassiveUpdateNotifier::backgroundCheckForUpdate()
             emit requestRestart();
         }
     }
+
+    OCUpdater::backgroundCheckForUpdate();
 }
 
 void PassiveUpdateNotifier::versionInfoArrived(const UpdateInfo &info)
diff --git a/src/gui/updater/ocupdater.h b/src/gui/updater/ocupdater.h
index 3983ac3..ef31075 100644
--- a/src/gui/updater/ocupdater.h
+++ b/src/gui/updater/ocupdater.h
@@ -112,9 +112,10 @@ signals:
 public slots:
     void slotStartInstaller();
 
-private slots:
+protected slots:
     void backgroundCheckForUpdate() Q_DECL_OVERRIDE;
 
+private slots:
     void slotOpenUpdateUrl();
     void slotVersionInfoArrived();
     void slotTimedOut();

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