From 41de1ce748d969a65bbefc6987c98d4e0a5010a3 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 19 Sep 2014 19:09:07 +0000 Subject: merge #2 git-svn-id: http://svn.miranda-ng.org/main/trunk@10527 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/WhatsApp/src/messages.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'protocols/WhatsApp/src/messages.cpp') 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; -- cgit v1.2.3