[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=8d3c544

The following commit has been merged in the master branch:
commit 8d3c5441ed41dd5df7a3a837a92f4b35b59e171a
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Sep 11 12:55:08 2015 +0200

    Tone down the debug
---
 telepathy-cm/connection.cpp                         | 18 ------------------
 telepathy-cm/kdeconnecttelepathyprotocolfactory.cpp |  1 -
 2 files changed, 19 deletions(-)

diff --git a/telepathy-cm/connection.cpp b/telepathy-cm/connection.cpp
index 1662689..e5c0a9e 100644
--- a/telepathy-cm/connection.cpp
+++ b/telepathy-cm/connection.cpp
@@ -45,8 +45,6 @@ Tp::SimpleStatusSpecMap ConnectConnection::getSimpleStatusSpecMap()
 ConnectConnection::ConnectConnection(const QDBusConnection &dbusConnection, const QString &cmName, const QString &protocolName, const QVariantMap &parameters) :
     Tp::BaseConnection(dbusConnection, cmName, protocolName, parameters)
 {
-    qDebug() << "making new connection";
-
     /* Connection.Interface.Contacts */
     contactsIface = Tp::BaseConnectionContactsInterface::create(this);
     contactsIface->setGetContactAttributesCallback(Tp::memFun(this, &ConnectConnection::getContactAttributes));
@@ -98,7 +96,6 @@ ConnectConnection::ConnectConnection(const QDBusConnection &dbusConnection, cons
 
 ConnectConnection::~ConnectConnection()
 {
-    qDebug() << "goodbye connection";
 }
 
 void ConnectConnection::connect(Tp::DBusError *error)
@@ -123,8 +120,6 @@ void ConnectConnection::connect(Tp::DBusError *error)
 
 QStringList ConnectConnection::inspectHandles(uint handleType, const Tp::UIntList &handles, Tp::DBusError *error)
 {
-    qDebug() << Q_FUNC_INFO;
-
     if (handleType != Tp::HandleTypeContact) {
         error->set(TP_QT_ERROR_INVALID_ARGUMENT, "Unsupported handle type");
         return QStringList();
@@ -151,10 +146,6 @@ Tp::BaseChannelPtr ConnectConnection::createChannelCB(const QVariantMap &request
     //note if we ever have this invoked from external clients we need to look for TargetID too and look it up
     const uint targetHandle = request.value(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandle")).toUInt();
 
-    qDebug() << "ConnectConnection::createChannel " << channelType
-             << " " << targetHandleType
-             << " " << targetHandle;
- 
     if ((targetHandleType != Tp::HandleTypeContact) || (targetHandle == 0)) {
           error->set(TP_QT_ERROR_INVALID_HANDLE, "createChannel error");
           return Tp::BaseChannelPtr();
@@ -166,7 +157,6 @@ Tp::BaseChannelPtr ConnectConnection::createChannelCB(const QVariantMap &request
 
     if (channelType == TP_QT_IFACE_CHANNEL_TYPE_TEXT) {
         ConnectTextChannelPtr textType = ConnectTextChannel::create(this, baseChannel.data(), targetHandle, identifier);
-        qDebug() << "Text interface is called " << textType->interfaceName();
         baseChannel->plugInterface(Tp::AbstractChannelInterfacePtr::dynamicCast(textType));
     }
 
@@ -175,8 +165,6 @@ Tp::BaseChannelPtr ConnectConnection::createChannelCB(const QVariantMap &request
 
 Tp::UIntList ConnectConnection::requestHandles(uint handleType, const QStringList &identifiers, Tp::DBusError *error)
 {
-    qDebug() << Q_FUNC_INFO << identifiers;
-
     Tp::UIntList result;
 
     if (handleType != Tp::HandleTypeContact) {
@@ -198,8 +186,6 @@ Tp::UIntList ConnectConnection::requestHandles(uint handleType, const QStringLis
 
 Tp::ContactAttributesMap ConnectConnection::getContactListAttributes(const QStringList &interfaces, bool hold, Tp::DBusError *error)
 {
-    qDebug() << Q_FUNC_INFO;
-
     Tp::ContactAttributesMap contactAttributes;
 
     foreach (const uint handle, m_handles.keys()) {
@@ -220,7 +206,6 @@ Tp::ContactAttributesMap ConnectConnection::getContactAttributes(const Tp::UIntL
 {
 //    Connection.Interface.Contacts
 //    http://telepathy.freedesktop.org/spec/Connection_Interface_Contacts.html#Method:GetContactAttributes
-    qDebug() << Q_FUNC_INFO << handles;
 
     Tp::ContactAttributesMap contactAttributes;
 
@@ -247,7 +232,6 @@ Tp::SimplePresence ConnectConnection::getPresence(uint handle)
 
 uint ConnectConnection::setPresence(const QString &status, const QString &message, Tp::DBusError *error)
 {
-    qDebug() << Q_FUNC_INFO << "not implemented";
     return 0;
 }
 
@@ -262,7 +246,6 @@ uint ConnectConnection::ensureContact(const QString &identifier)
 
 uint ConnectConnection::addContacts(const QStringList &identifiers)
 {
-    qDebug() << Q_FUNC_INFO;
     uint handle = 0;
 
     if (!m_handles.isEmpty()) {
@@ -281,7 +264,6 @@ uint ConnectConnection::addContacts(const QStringList &identifiers)
 
 uint ConnectConnection::addContact(const QString &identifier)
 {
-    qDebug() << Q_FUNC_INFO;
     return addContacts(QStringList() << identifier);
 }
 
diff --git a/telepathy-cm/kdeconnecttelepathyprotocolfactory.cpp b/telepathy-cm/kdeconnecttelepathyprotocolfactory.cpp
index c5d694f..8c8f14e 100644
--- a/telepathy-cm/kdeconnecttelepathyprotocolfactory.cpp
+++ b/telepathy-cm/kdeconnecttelepathyprotocolfactory.cpp
@@ -21,7 +21,6 @@ Tp::WeakPtr<KDEConnectTelepathyProtocol> KDEConnectTelepathyProtocolFactory::s_i
 ConnectProtocolPtr KDEConnectTelepathyProtocolFactory::interface() {
     if (s_interface.isNull()) {
         Tp::registerTypes();
-        Tp::enableDebug(true);
         Tp::enableWarnings(true);
 
         ConnectProtocolPtr protocol = Tp::BaseProtocol::create<KDEConnectTelepathyProtocol>(

-- 
kdeconnect packaging