tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tone down the debug

Browse source
This commit is contained in:
David Edmundson 2015-09-11 12:55:08 +02:00
parent 95f01c4bea
commit 8d3c5441ed
2 changed files with 0 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
telepathy-cm/connection.cpp
View file

@ -45,8 +45,6 @@ Tp::SimpleStatusSpecMap ConnectConnection::getSimpleStatusSpecMap()
ConnectConnection::ConnectConnection(const QDBusConnection &dbusConnection, const QString &cmName, const QString &protocolName, const QVariantMap &parameters) : ConnectConnection::ConnectConnection(const QDBusConnection &dbusConnection, const QString &cmName, const QString &protocolName, const QVariantMap &parameters) :
Tp::BaseConnection(dbusConnection, cmName, protocolName, parameters) Tp::BaseConnection(dbusConnection, cmName, protocolName, parameters)
{ {
qDebug() << "making new connection";
/* Connection.Interface.Contacts */ /* Connection.Interface.Contacts */
contactsIface = Tp::BaseConnectionContactsInterface::create(this); contactsIface = Tp::BaseConnectionContactsInterface::create(this);
contactsIface->setGetContactAttributesCallback(Tp::memFun(this, &ConnectConnection::getContactAttributes)); contactsIface->setGetContactAttributesCallback(Tp::memFun(this, &ConnectConnection::getContactAttributes));
@ -98,7 +96,6 @@ ConnectConnection::ConnectConnection(const QDBusConnection &dbusConnection, cons
ConnectConnection::~ConnectConnection() ConnectConnection::~ConnectConnection()
{ {
qDebug() << "goodbye connection";
} }
void ConnectConnection::connect(Tp::DBusError *error) 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) QStringList ConnectConnection::inspectHandles(uint handleType, const Tp::UIntList &handles, Tp::DBusError *error)
{ {
qDebug() << Q_FUNC_INFO;
if (handleType != Tp::HandleTypeContact) { if (handleType != Tp::HandleTypeContact) {
error->set(TP_QT_ERROR_INVALID_ARGUMENT, "Unsupported handle type"); error->set(TP_QT_ERROR_INVALID_ARGUMENT, "Unsupported handle type");
return QStringList(); 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 //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(); const uint targetHandle = request.value(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandle")).toUInt();
qDebug() << "ConnectConnection::createChannel " << channelType
<< " " << targetHandleType
<< " " << targetHandle;
if ((targetHandleType != Tp::HandleTypeContact) || (targetHandle == 0)) { if ((targetHandleType != Tp::HandleTypeContact) || (targetHandle == 0)) {
error->set(TP_QT_ERROR_INVALID_HANDLE, "createChannel error"); error->set(TP_QT_ERROR_INVALID_HANDLE, "createChannel error");
return Tp::BaseChannelPtr(); return Tp::BaseChannelPtr();
@ -166,7 +157,6 @@ Tp::BaseChannelPtr ConnectConnection::createChannelCB(const QVariantMap &request
if (channelType == TP_QT_IFACE_CHANNEL_TYPE_TEXT) { if (channelType == TP_QT_IFACE_CHANNEL_TYPE_TEXT) {
ConnectTextChannelPtr textType = ConnectTextChannel::create(this, baseChannel.data(), targetHandle, identifier); ConnectTextChannelPtr textType = ConnectTextChannel::create(this, baseChannel.data(), targetHandle, identifier);
qDebug() << "Text interface is called " << textType->interfaceName();
baseChannel->plugInterface(Tp::AbstractChannelInterfacePtr::dynamicCast(textType)); 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) Tp::UIntList ConnectConnection::requestHandles(uint handleType, const QStringList &identifiers, Tp::DBusError *error)
{ {
qDebug() << Q_FUNC_INFO << identifiers;
Tp::UIntList result; Tp::UIntList result;
if (handleType != Tp::HandleTypeContact) { 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) Tp::ContactAttributesMap ConnectConnection::getContactListAttributes(const QStringList &interfaces, bool hold, Tp::DBusError *error)
{ {
qDebug() << Q_FUNC_INFO;
Tp::ContactAttributesMap contactAttributes; Tp::ContactAttributesMap contactAttributes;
foreach (const uint handle, m_handles.keys()) { foreach (const uint handle, m_handles.keys()) {
@ -220,7 +206,6 @@ Tp::ContactAttributesMap ConnectConnection::getContactAttributes(const Tp::UIntL
{ {
// Connection.Interface.Contacts // Connection.Interface.Contacts
// http://telepathy.freedesktop.org/spec/Connection_Interface_Contacts.html#Method:GetContactAttributes // http://telepathy.freedesktop.org/spec/Connection_Interface_Contacts.html#Method:GetContactAttributes
qDebug() << Q_FUNC_INFO << handles;
Tp::ContactAttributesMap contactAttributes; 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) uint ConnectConnection::setPresence(const QString &status, const QString &message, Tp::DBusError *error)
{ {
qDebug() << Q_FUNC_INFO << "not implemented";
return 0; return 0;
} }
@ -262,7 +246,6 @@ uint ConnectConnection::ensureContact(const QString &identifier)
uint ConnectConnection::addContacts(const QStringList &identifiers) uint ConnectConnection::addContacts(const QStringList &identifiers)
{ {
qDebug() << Q_FUNC_INFO;
uint handle = 0; uint handle = 0;
if (!m_handles.isEmpty()) { if (!m_handles.isEmpty()) {
@ -281,7 +264,6 @@ uint ConnectConnection::addContacts(const QStringList &identifiers)
uint ConnectConnection::addContact(const QString &identifier) uint ConnectConnection::addContact(const QString &identifier)
{ {
qDebug() << Q_FUNC_INFO;
return addContacts(QStringList() << identifier); return addContacts(QStringList() << identifier);
} }

1
telepathy-cm/kdeconnecttelepathyprotocolfactory.cpp
View file

@ -21,7 +21,6 @@ Tp::WeakPtr<KDEConnectTelepathyProtocol> KDEConnectTelepathyProtocolFactory::s_i
ConnectProtocolPtr KDEConnectTelepathyProtocolFactory::interface() { ConnectProtocolPtr KDEConnectTelepathyProtocolFactory::interface() {
if (s_interface.isNull()) { if (s_interface.isNull()) {
Tp::registerTypes(); Tp::registerTypes();
Tp::enableDebug(true);
Tp::enableWarnings(true); Tp::enableWarnings(true);
ConnectProtocolPtr protocol = Tp::BaseProtocol::create<KDEConnectTelepathyProtocol>( ConnectProtocolPtr protocol = Tp::BaseProtocol::create<KDEConnectTelepathyProtocol>(