[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:21:17 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=7cd98f2
The following commit has been merged in the master branch:
commit 7cd98f243fce1ca05ca960250d08f404e47b8fe3
Author: Lasath Fernando <kde at lasath.org>
Date: Tue Feb 14 12:28:02 2012 +1100
Make MessagesModel support Action Messages
---
plasmoid/declarative-plugin/messages-model.cpp | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/plasmoid/declarative-plugin/messages-model.cpp b/plasmoid/declarative-plugin/messages-model.cpp
index cb3daf0..92cd930 100644
--- a/plasmoid/declarative-plugin/messages-model.cpp
+++ b/plasmoid/declarative-plugin/messages-model.cpp
@@ -133,7 +133,9 @@ void MessagesModel::onMessageReceived(const Tp::ReceivedMessage &message)
kDebug() << "text =" << message.text();
kDebug() << "messageToken =" << message.messageToken();
- if (message.messageType() == Tp::ChannelTextMessageTypeNormal) {
+ if (message.messageType() == Tp::ChannelTextMessageTypeNormal ||
+ message.messageType() == Tp::ChannelTextMessageTypeAction) {
+
int length = rowCount();
beginInsertRows(QModelIndex(), length, length);
@@ -141,7 +143,7 @@ void MessagesModel::onMessageReceived(const Tp::ReceivedMessage &message)
message.sender()->alias(),
MessageProcessor::instance()->processIncomingMessage(message).finalizedMessage(),
message.received(),
- MessagesModel::MessageTypeIncoming,
+ message.messageType() == Tp::ChannelTextMessageTypeAction ? MessageTypeAction : MessageTypeIncoming,
message.messageToken()
));
@@ -170,7 +172,7 @@ void MessagesModel::onMessageSent(const Tp::Message &message, Tp::MessageSending
i18n("Me"), //FIXME : use actual nickname from Tp::AccountPtr
MessageProcessor::instance()->processOutgoingMessage(message).finalizedMessage(),
message.sent(),
- MessagesModel::MessageTypeOutgoing,
+ message.messageType() == Tp::ChannelTextMessageTypeAction ? MessageTypeAction : MessageTypeOutgoing,
message.messageToken()
));
@@ -229,7 +231,17 @@ void MessagesModel::sendNewMessage(const QString &message)
if (message.isEmpty()) {
kWarning() << "Attempting to send empty string";
} else {
- connect(d->textChannel->send(message),
+ Tp::PendingOperation *op;
+ QString modifiedMessage = message;
+ if (d->textChannel->supportsMessageType(Tp::ChannelTextMessageTypeAction)
+ && modifiedMessage.startsWith(QLatin1String("/me "))) {
+ //remove "/me " from the start of the message
+ modifiedMessage.remove(0,4);
+ op = d->textChannel->send(modifiedMessage, Tp::ChannelTextMessageTypeAction);
+ } else {
+ op = d->textChannel->send(modifiedMessage);
+ }
+ connect(op,
SIGNAL(finished(Tp::PendingOperation*)),
SLOT(verifyPendingOperation(Tp::PendingOperation*)));
}
--
ktp-text-ui packaging
More information about the pkg-kde-commits
mailing list