summaryrefslogtreecommitdiff
path: root/protocols/WhatsApp/src/messages.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2014-09-19 19:09:07 +0000
committerGeorge Hazan <george.hazan@gmail.com>2014-09-19 19:09:07 +0000
commit41de1ce748d969a65bbefc6987c98d4e0a5010a3 (patch)
tree7568765f0ebf66fa54fa470f4eee22251301bc58 /protocols/WhatsApp/src/messages.cpp
parent5148c6e14bc21f758810aafff715bc4121c80d57 (diff)
merge #2
git-svn-id: http://svn.miranda-ng.org/main/trunk@10527 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/WhatsApp/src/messages.cpp')
-rw-r--r--protocols/WhatsApp/src/messages.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/protocols/WhatsApp/src/messages.cpp b/protocols/WhatsApp/src/messages.cpp
index f232d5f451..b9f2288164 100644
--- a/protocols/WhatsApp/src/messages.cpp
+++ b/protocols/WhatsApp/src/messages.cpp
@@ -119,7 +119,6 @@ void WhatsAppProto::onIsTyping(const std::string& paramString, bool paramBoolean
}
}
-
int WhatsAppProto::UserIsTyping(MCONTACT hContact, int type)
{
if (hContact && isOnline())
@@ -139,13 +138,12 @@ void WhatsAppProto::SendTypingWorker(void* p)
if (getWord(typing->hContact, "Status", 0) == ID_STATUS_OFFLINE)
return;
- DBVARIANT dbv;
- if (!getString(typing->hContact, WHATSAPP_KEY_ID, &dbv) &&
- this->isOnline()) {
+ ptrA jid(getStringA(typing->hContact, WHATSAPP_KEY_ID));
+ if (jid && this->isOnline()) {
if (typing->status == PROTOTYPE_SELFTYPING_ON)
- this->connection->sendComposing(dbv.pszVal);
+ this->connection->sendComposing((char*)jid);
else
- this->connection->sendPaused(dbv.pszVal);
+ this->connection->sendPaused((char*)jid);
}
delete typing;