From 9cc628c7871629af3d660029c0d764eef44c733b Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 7 Oct 2013 12:10:44 +0000 Subject: compilation fix git-svn-id: http://svn.miranda-ng.org/main/trunk@6394 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/WhatsApp/src/proto.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'protocols/WhatsApp') diff --git a/protocols/WhatsApp/src/proto.cpp b/protocols/WhatsApp/src/proto.cpp index 1872fc21b8..a3bc4bd041 100644 --- a/protocols/WhatsApp/src/proto.cpp +++ b/protocols/WhatsApp/src/proto.cpp @@ -233,7 +233,7 @@ string WhatsAppProto::Register(int state, string cc, string number, string code) LOG("Server response: %s", pnlhr->pData); MessageBoxA(NULL, pnlhr->pData, "Debug", MB_OK); - JSONNODE* resp = json_parse(pnlhr->pData); + JSONROOT resp(pnlhr->pData); if (resp == NULL) { this->NotifyEvent(title, this->TranslateStr("Registration failed. Invalid server response."), NULL, WHATSAPP_EVENT_CLIENT); @@ -242,10 +242,10 @@ string WhatsAppProto::Register(int state, string cc, string number, string code) // Status = fail JSONNODE *val = json_get(resp, "status"); - if (!lstrcmpA( json_as_string(val), "fail")) + if (!lstrcmp( ptrT(json_as_string(val)), _T("fail"))) { JSONNODE *tmpVal = json_get(resp, "reason"); - if (!lstrcmpA( json_as_string(tmpVal), "stale")) + if (!lstrcmp( ptrT(json_as_string(tmpVal)), _T("stale"))) this->NotifyEvent(title, this->TranslateStr("Registration failed due to stale code. Please request a new code"), NULL, WHATSAPP_EVENT_CLIENT); else this->NotifyEvent(title, this->TranslateStr("Registration failed."), NULL, WHATSAPP_EVENT_CLIENT); @@ -258,7 +258,7 @@ string WhatsAppProto::Register(int state, string cc, string number, string code) // Request code else if (state == REG_STATE_REQ_CODE) { - if (!lstrcmpA(json_as_string(val), "sent")) + if ( !lstrcmp( ptrT(json_as_string(val)), _T("sent"))) this->NotifyEvent(title, this->TranslateStr("Registration code has been sent to your phone."), NULL, WHATSAPP_EVENT_OTHER); } @@ -269,7 +269,7 @@ string WhatsAppProto::Register(int state, string cc, string number, string code) if (val == NULL) this->NotifyEvent(title, this->TranslateStr("Registration failed."), NULL, WHATSAPP_EVENT_CLIENT); else - ret = json_as_string(val); + ret = _T2A( ptrT(json_as_string(val))); } json_delete(resp); -- cgit v1.2.3