telepathy-qt: Revert "!Hackish! BaseChannelMessagesInterface::sendMessage: Token added to message header."

David Edmundson davidedmundson at kemper.freedesktop.org
Sun Sep 7 09:13:45 PDT 2014


Module: telepathy-qt
Branch: master
Commit: 0205d383bb9b44a3b8c19fbecebd3e62315415ed
URL:    http://cgit.freedesktop.org/telepathy/telepathy-qt/commit/?id=0205d383bb9b44a3b8c19fbecebd3e62315415ed

Author: Alexandr Akulich <akulichalexander at gmail.com>
Date:   Thu Sep  4 00:58:02 2014 +0600

Revert "!Hackish! BaseChannelMessagesInterface::sendMessage: Token added to message header."

Commit is useless, but patch is mostly reused in dd540578594d26cfcde54fc739992cae2f9b32fc.

This reverts commit 6cb774eb3994b513e321a91cfcc2d29b9aa494c3.

Conflicts:
	TelepathyQt/base-channel.cpp

---

 TelepathyQt/base-channel.cpp |    2 --
 1 file changed, 2 deletions(-)

diff --git a/TelepathyQt/base-channel.cpp b/TelepathyQt/base-channel.cpp
index af9aad1..a0c265b 100644
--- a/TelepathyQt/base-channel.cpp
+++ b/TelepathyQt/base-channel.cpp
@@ -707,7 +707,6 @@ QString BaseChannelMessagesInterface::sendMessage(const Tp::MessagePartList &mes
     Tp::MessagePartList fixedMessage = message;
 
     MessagePart header = fixedMessage.front();
-    header[QLatin1String("message-token")] = QDBusVariant(token);
 
     uint timestamp = 0;
     if (header.count(QLatin1String("message-sent"))) {
@@ -731,7 +730,6 @@ QString BaseChannelMessagesInterface::sendMessage(const Tp::MessagePartList &mes
         return token;
     }
 
-
     uint type = ChannelTextMessageTypeNormal;
     if (header.count(QLatin1String("message-type")))
         type = header[QLatin1String("message-type")].variant().toUInt();



More information about the telepathy-commits mailing list