diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-10-07 12:10:44 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-10-07 12:10:44 +0000 |
| commit | 9cc628c7871629af3d660029c0d764eef44c733b (patch) | |
| tree | c7d03eebe059ede6c3d9e70802328e07df11dd8b /protocols/WhatsApp/src/proto.cpp | |
| parent | 67d3752f3e59e7f5af163f3521f2c2011392d1f9 (diff) | |
compilation fix
git-svn-id: http://svn.miranda-ng.org/main/trunk@6394 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/WhatsApp/src/proto.cpp')
| -rw-r--r-- | protocols/WhatsApp/src/proto.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
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);
|