[Pkg-owncloud-commits] [owncloud-client] 47/47: Updated 0001-disable-updatecheck.patch

[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 cc4478d69486b175b50927b49518a23dbac8d57d
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Mon Feb 17 19:03:27 2014 +0100

    Updated 0001-disable-updatecheck.patch
---
 debian/patches/0001-disable-updatecheck.patch | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/debian/patches/0001-disable-updatecheck.patch b/debian/patches/0001-disable-updatecheck.patch
index ef55cb0..96d9c75 100644
--- a/debian/patches/0001-disable-updatecheck.patch
+++ b/debian/patches/0001-disable-updatecheck.patch
@@ -2,22 +2,24 @@ Description: Phoning-home version checks should be disabled in Debian packages
 Author: Sandro Knauß <bugs at ssandroknauss.de>
 Origin: debian
 Bug-debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=721341
-Last-Update: 2013-09-12
+Last-Update: 2014-02-17
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 Index: owncloud-client/src/mirall/mirallconfigfile.cpp
 ===================================================================
---- owncloud-client.orig/src/mirall/mirallconfigfile.cpp	2014-02-06 18:11:00.353472370 +0100
-+++ owncloud-client/src/mirall/mirallconfigfile.cpp	2014-02-06 18:11:00.346805643 +0100
-@@ -327,9 +327,12 @@
-     QSettings settings(configFile(), QSettings::IniFormat);
-     settings.beginGroup( con );
+--- owncloud-client.orig/src/mirall/mirallconfigfile.cpp	2014-02-17 18:55:05.443108112 +0100
++++ owncloud-client/src/mirall/mirallconfigfile.cpp	2014-02-17 18:57:13.177276556 +0100
+@@ -344,11 +344,14 @@
+     QString con( connection );
+     if( connection.isEmpty() ) con = defaultConnection();
  
--    bool skipIt = settings.value( QLatin1String(skipUpdateCheckC), false ).toBool();
-+    bool skipIt = settings.value( QLatin1String(skipUpdateCheckC), true ).toBool();
+-    QVariant fallback = getValue(QLatin1String(skipUpdateCheckC), con, false);
++    QVariant fallback = getValue(QLatin1String(skipUpdateCheckC), con, true);
+     fallback = getValue(QLatin1String(skipUpdateCheckC), QString(), fallback);
  
--    return skipIt;
-+    if ( !skipIt )
+     QVariant value = getPolicySetting(QLatin1String(skipUpdateCheckC), fallback);
+-    return value.toBool();
++    if ( !value )
 +        qDebug() << "debian disabled the UpdateCheck mechanism.";
 +
 +    return true;

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