diff options
Diffstat (limited to 'protocols/SkypeWeb/src')
| -rw-r--r-- | protocols/SkypeWeb/src/skype_avatars.cpp | 2 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_chatrooms.cpp | 4 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_contacts.cpp | 4 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_files.cpp | 2 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_history_sync.cpp | 4 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_profile.cpp | 2 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_search.cpp | 2 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_utils.h | 10 |
8 files changed, 20 insertions, 10 deletions
diff --git a/protocols/SkypeWeb/src/skype_avatars.cpp b/protocols/SkypeWeb/src/skype_avatars.cpp index 2b5ce586fa..67fa2f4d3a 100644 --- a/protocols/SkypeWeb/src/skype_avatars.cpp +++ b/protocols/SkypeWeb/src/skype_avatars.cpp @@ -191,7 +191,7 @@ struct SetAvatarRequest : public AsyncHttpRequest void CSkypeProto::OnSentAvatar(MHttpResponse *response, AsyncHttpRequest*)
{
- JsonReply root(response);
+ SkypeReply root(response);
if (root.error())
return;
}
diff --git a/protocols/SkypeWeb/src/skype_chatrooms.cpp b/protocols/SkypeWeb/src/skype_chatrooms.cpp index dc8cf49007..498ed4458d 100644 --- a/protocols/SkypeWeb/src/skype_chatrooms.cpp +++ b/protocols/SkypeWeb/src/skype_chatrooms.cpp @@ -353,7 +353,7 @@ void CSkypeProto::SendChatMessage(SESSION_INFO *si, const wchar_t *tszMessage) void CSkypeProto::OnGetChatMembers(MHttpResponse *response, AsyncHttpRequest *pRequest)
{
- JsonReply reply(response);
+ SkypeReply reply(response);
if (reply.error())
return;
@@ -375,7 +375,7 @@ void CSkypeProto::OnGetChatMembers(MHttpResponse *response, AsyncHttpRequest *pR void CSkypeProto::OnGetChatInfo(MHttpResponse *response, AsyncHttpRequest*)
{
- JsonReply reply(response);
+ SkypeReply reply(response);
if (reply.error())
return;
diff --git a/protocols/SkypeWeb/src/skype_contacts.cpp b/protocols/SkypeWeb/src/skype_contacts.cpp index daed188bb2..c70a432005 100644 --- a/protocols/SkypeWeb/src/skype_contacts.cpp +++ b/protocols/SkypeWeb/src/skype_contacts.cpp @@ -102,7 +102,7 @@ MCONTACT CSkypeProto::AddContact(const char *skypeId, const char *nick, bool isT void CSkypeProto::LoadContactsAuth(MHttpResponse *response, AsyncHttpRequest*)
{
- JsonReply reply(response);
+ SkypeReply reply(response);
if (reply.error())
return;
@@ -140,7 +140,7 @@ void CSkypeProto::LoadContactsAuth(MHttpResponse *response, AsyncHttpRequest*) void CSkypeProto::LoadContactList(MHttpResponse *response, AsyncHttpRequest*)
{
- JsonReply reply(response);
+ SkypeReply reply(response);
if (reply.error())
return;
diff --git a/protocols/SkypeWeb/src/skype_files.cpp b/protocols/SkypeWeb/src/skype_files.cpp index 41608e3c8b..e1c59cac7d 100644 --- a/protocols/SkypeWeb/src/skype_files.cpp +++ b/protocols/SkypeWeb/src/skype_files.cpp @@ -48,7 +48,7 @@ void CSkypeProto::ReceiveFileThread(void *param) nlhr.AddHeader("Cookie", szCookie);
NLHR_PTR response(Netlib_HttpTransaction(m_hNetlibUser, &nlhr));
if (response) {
- JsonReply reply(response);
+ SkypeReply reply(response);
if (!reply.error()) {
auto &root = reply.data();
if (root["content_state"].as_string() == "ready")
diff --git a/protocols/SkypeWeb/src/skype_history_sync.cpp b/protocols/SkypeWeb/src/skype_history_sync.cpp index ffa7b7292e..33d48aff12 100644 --- a/protocols/SkypeWeb/src/skype_history_sync.cpp +++ b/protocols/SkypeWeb/src/skype_history_sync.cpp @@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. void CSkypeProto::OnGetServerHistory(MHttpResponse *response, AsyncHttpRequest *pRequest)
{
- JsonReply reply(response);
+ SkypeReply reply(response);
if (reply.error())
return;
@@ -96,7 +96,7 @@ INT_PTR CSkypeProto::SvcLoadHistory(WPARAM hContact, LPARAM) void CSkypeProto::OnSyncConversations(MHttpResponse *response, AsyncHttpRequest*)
{
- JsonReply reply(response);
+ SkypeReply reply(response);
if (reply.error())
return;
diff --git a/protocols/SkypeWeb/src/skype_profile.cpp b/protocols/SkypeWeb/src/skype_profile.cpp index 5bfcd49513..f06b22102c 100644 --- a/protocols/SkypeWeb/src/skype_profile.cpp +++ b/protocols/SkypeWeb/src/skype_profile.cpp @@ -105,7 +105,7 @@ void CSkypeProto::LoadProfile(MHttpResponse *response, AsyncHttpRequest *pReques {
MCONTACT hContact = (DWORD_PTR)pRequest->pUserInfo;
- JsonReply reply(response);
+ SkypeReply reply(response);
if (reply.error()) {
ProtoBroadcastAck(hContact, ACKTYPE_GETINFO, ACKRESULT_FAILED, 0);
return;
diff --git a/protocols/SkypeWeb/src/skype_search.cpp b/protocols/SkypeWeb/src/skype_search.cpp index 67c5ffbcfa..80029f4754 100644 --- a/protocols/SkypeWeb/src/skype_search.cpp +++ b/protocols/SkypeWeb/src/skype_search.cpp @@ -34,7 +34,7 @@ void CSkypeProto::OnSearch(MHttpResponse *response, AsyncHttpRequest*) {
debugLogA(__FUNCTION__);
- JsonReply reply(response);
+ SkypeReply reply(response);
if (reply.error()) {
ProtoBroadcastAck(0, ACKTYPE_SEARCH, ACKRESULT_SUCCESS, (HANDLE)1, 0);
return;
diff --git a/protocols/SkypeWeb/src/skype_utils.h b/protocols/SkypeWeb/src/skype_utils.h index aecb8f66fe..7ea1e290dd 100644 --- a/protocols/SkypeWeb/src/skype_utils.h +++ b/protocols/SkypeWeb/src/skype_utils.h @@ -60,4 +60,14 @@ struct CFileUploadParam : public MZeroedObject }
};
+struct SkypeReply : public JsonReply
+{
+ SkypeReply(MHttpResponse *response) :
+ JsonReply(response)
+ {
+ if (m_root)
+ m_errorCode = (*m_root)["status"]["code"].as_int();
+ }
+};
+
#endif //_UTILS_H_
|