[Pkg-owncloud-commits] [owncloud-client] 343/484: Connectivity: Improve log output

[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 ef17dc64826e7af2a7da924850f5b38588a40ddb
Author: Markus Goetz <markus at woboq.com>
Date:   Tue Nov 17 11:02:15 2015 +0100

    Connectivity: Improve log output
---
 src/gui/accountstate.cpp            | 2 +-
 src/libsync/connectionvalidator.cpp | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/gui/accountstate.cpp b/src/gui/accountstate.cpp
index dcb2d9b..1770c38 100644
--- a/src/gui/accountstate.cpp
+++ b/src/gui/accountstate.cpp
@@ -142,7 +142,7 @@ void AccountState::checkConnectivity(CredentialFetchMode credentialsFetchMode)
     }
 
     if (_connectionValidator) {
-        qDebug() << "ConnectionValidator already running, ignoring";
+        qDebug() << "ConnectionValidator already running, ignoring" << account()->displayName();
         return;
     }
     _credentialsFetchMode = credentialsFetchMode;
diff --git a/src/libsync/connectionvalidator.cpp b/src/libsync/connectionvalidator.cpp
index 750f601..ba81cf4 100644
--- a/src/libsync/connectionvalidator.cpp
+++ b/src/libsync/connectionvalidator.cpp
@@ -85,7 +85,11 @@ void ConnectionValidator::systemProxyLookupDone(const QNetworkProxy &proxy) {
         return;
     }
 
-    qDebug() << Q_FUNC_INFO << "Setting QNAM proxy to be system proxy" << printQNetworkProxy(proxy);
+    if (proxy.type() != QNetworkProxy::NoProxy) {
+        qDebug() << "Setting QNAM proxy to be system proxy" << printQNetworkProxy(proxy);
+    } else {
+        qDebug() << "No system proxy set by OS";
+    }
     _account->networkAccessManager()->setProxy(proxy);
 
     slotCheckServerAndAuth();

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