[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:29:58 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=2cdf7d5
The following commit has been merged in the master branch:
commit 2cdf7d5499107ecb7e49e96fc3528071ce8d6d93
Author: Albert Vaca <albertvaka at gmail.com>
Date: Tue Jul 12 12:49:21 2016 +0200
Reduced logging
---
core/backends/lan/lanlinkprovider.cpp | 13 +++++++------
core/device.cpp | 2 +-
core/pluginloader.cpp | 2 +-
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
index 451028e..d969e23 100644
--- a/core/backends/lan/lanlinkprovider.cpp
+++ b/core/backends/lan/lanlinkprovider.cpp
@@ -426,12 +426,13 @@ void LanLinkProvider::configureSslSocket(QSslSocket* socket, const QString& devi
socket->setPeerVerifyMode(QSslSocket::QueryPeer);
}
- QObject::connect(socket, static_cast<void (QSslSocket::*)(const QList<QSslError>&)>(&QSslSocket::sslErrors), [](const QList<QSslError>& errors)
- {
- Q_FOREACH (const QSslError &error, errors) {
- qCDebug(KDECONNECT_CORE) << "SSL Error:" << error.errorString();
- }
- });
+ //Usually SSL errors are only bad for trusted devices. Uncomment this section to log errors in any case, for debugging.
+ //QObject::connect(socket, static_cast<void (QSslSocket::*)(const QList<QSslError>&)>(&QSslSocket::sslErrors), [](const QList<QSslError>& errors)
+ //{
+ // Q_FOREACH (const QSslError &error, errors) {
+ // qCDebug(KDECONNECT_CORE) << "SSL Error:" << error.errorString();
+ // }
+ //});
}
void LanLinkProvider::configureSocket(QSslSocket* socket) {
diff --git a/core/device.cpp b/core/device.cpp
index b5a0abd..fb89cee 100644
--- a/core/device.cpp
+++ b/core/device.cpp
@@ -232,7 +232,7 @@ void Device::addLink(const NetworkPackage& identityPackage, DeviceLink* link)
, incomingCapabilities = identityPackage.get<QStringList>("incomingCapabilities").toSet();
m_supportedPlugins = PluginLoader::instance()->pluginsForCapabilities(incomingCapabilities, outgoingCapabilities);
- qDebug() << "new plugins for" << m_deviceName << m_supportedPlugins << incomingCapabilities << outgoingCapabilities;
+ //qDebug() << "new plugins for" << m_deviceName << m_supportedPlugins << incomingCapabilities << outgoingCapabilities;
} else {
m_supportedPlugins = PluginLoader::instance()->getPluginList().toSet();
}
diff --git a/core/pluginloader.cpp b/core/pluginloader.cpp
index 442c369..0a908f5 100644
--- a/core/pluginloader.cpp
+++ b/core/pluginloader.cpp
@@ -113,7 +113,7 @@ QSet<QString> PluginLoader::pluginsForCapabilities(const QSet<QString>& incoming
|| incoming.intersects(pluginOutgoingCapabilities) || outgoing.intersects(pluginIncomingCapabilities)) {
ret += service.pluginId();
} else {
- qDebug() << "discarding..." << service.pluginId();
+ qCDebug(KDECONNECT_CORE) << "Not loading plugin" << service.pluginId() << "because device doesn't support it";
}
}
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list