diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-05-29 14:53:33 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-05-29 14:53:33 +0000 |
| commit | 2fcca210a1f695d7a932b873ae00dc702d42cfeb (patch) | |
| tree | 2f06ee3f54a5d7cd6f479497cfd2111c2f5afffa /protocols/SkypeWeb/src/requests/chatrooms.h | |
| parent | 72e13eb85e4b7aaf0ba82a2de750e1eee454bd6b (diff) | |
SkypeWeb to use new json parser
git-svn-id: http://svn.miranda-ng.org/main/trunk@13891 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/SkypeWeb/src/requests/chatrooms.h')
| -rw-r--r-- | protocols/SkypeWeb/src/requests/chatrooms.h | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/protocols/SkypeWeb/src/requests/chatrooms.h b/protocols/SkypeWeb/src/requests/chatrooms.h index 57e76b2cf2..fa91a712a9 100644 --- a/protocols/SkypeWeb/src/requests/chatrooms.h +++ b/protocols/SkypeWeb/src/requests/chatrooms.h @@ -48,16 +48,13 @@ public: << FORMAT_VALUE("RegistrationToken", "registrationToken=%s", regToken)
<< CHAR_VALUE("Content-Type", "application/json; charset=UTF-8");
- JSONNODE *node = json_new(5);
- json_push_back(node, json_new_i("clientmessageid", timestamp));
- json_push_back(node, json_new_a("messagetype", "RichText"));
- json_push_back(node, json_new_a("contenttype", "text"));
- json_push_back(node, json_new_a("content", ptrA(mir_utf8encode(message))));
+ JSONNode node(JSON_NODE);
+ node.push_back(JSONNode("clientmessageid", (long)timestamp));
+ node.push_back(JSONNode("messagetype", "RichText"));
+ node.push_back(JSONNode("contenttype", "text"));
+ node.push_back(JSONNode("content", ptrA(mir_utf8encode(message))));
- T2Utf data(ptrT(json_write(node)));
- Body << VALUE(data);
-
- json_delete(node);
+ Body << VALUE(node.write().c_str());
}
};
@@ -72,17 +69,14 @@ public: << FORMAT_VALUE("RegistrationToken", "registrationToken=%s", regToken)
<< CHAR_VALUE("Content-Type", "application/json; charset=UTF-8");
- JSONNODE *node = json_new(5);
- json_push_back(node, json_new_i("clientmessageid", timestamp));
- json_push_back(node, json_new_a("messagetype", "RichText"));
- json_push_back(node, json_new_a("contenttype", "text"));
- json_push_back(node, json_new_a("content", ptrA(mir_utf8encode(message))));
- json_push_back(node, json_new_i("skypeemoteoffset", 4));
-
- T2Utf data(ptrT(json_write(node)));
- Body << VALUE(data);
+ JSONNode node(JSON_NODE);
+ node.push_back(JSONNode("clientmessageid", (long)timestamp));
+ node.push_back(JSONNode("messagetype", "RichText"));
+ node.push_back(JSONNode("contenttype", "text"));
+ node.push_back(JSONNode("content", ptrA(mir_utf8encode(message))));
+ node.push_back(JSONNode("skypeemoteoffset", 4));
- json_delete(node);
+ Body << VALUE(node.write().c_str());
}
};
|