diff options
| author | MikalaiR <nikolay.romanovich@narod.ru> | 2015-05-02 11:27:20 +0000 |
|---|---|---|
| committer | MikalaiR <nikolay.romanovich@narod.ru> | 2015-05-02 11:27:20 +0000 |
| commit | b96fa2b498afb19bda93d0cd1e399589d17d3d3e (patch) | |
| tree | 7ffdee1b60531babd7ea6269fd50f91eccdd9bb3 /protocols/SkypeWeb/src/skype_trouter.cpp | |
| parent | 198c817b781f9982f73c411a30fd6e1e79760a3e (diff) | |
SkypeWeb: Sound on call cancel. Minor fixes.
git-svn-id: http://svn.miranda-ng.org/main/trunk@13369 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/SkypeWeb/src/skype_trouter.cpp')
| -rw-r--r-- | protocols/SkypeWeb/src/skype_trouter.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/protocols/SkypeWeb/src/skype_trouter.cpp b/protocols/SkypeWeb/src/skype_trouter.cpp index ff45e744cd..854a4e75d7 100644 --- a/protocols/SkypeWeb/src/skype_trouter.cpp +++ b/protocols/SkypeWeb/src/skype_trouter.cpp @@ -28,7 +28,7 @@ void CSkypeProto::OnCreateTrouter(const NETLIBHTTPREQUEST *response) ptrA instance(mir_t2a(ptrT(json_as_string(json_get(root, "instance")))));
ptrA socketio(mir_t2a(ptrT(json_as_string(json_get(root, "socketio")))));
ptrA url(mir_t2a(ptrT(json_as_string(json_get(root, "url")))));
- setString("Trouter_ccid", ccid);
+ setString("Trouter_ccid", ccid);
setString("Trouter_connId", connId);
setString("Trouter_instance", instance);
setString("Trouter_socketio", socketio);
@@ -130,6 +130,7 @@ void CSkypeProto::OnTrouterEvent(JSONNODE *body, JSONNODE *headers) case 104: //call canceled: callerId=""; conversationId=NULL; callId=call id
{
ptrA callId(mir_t2a(ptrT(json_as_string(json_get(body, "callId")))));
+ SkinPlaySound("skype_call_canceled");
break;
}
}
@@ -179,8 +180,8 @@ void CSkypeProto::TRouterThread(void*) JSONROOT root(json);
ptrA szBody(mir_t2a(ptrT(json_as_string(json_get(root, "body")))));
JSONNODE *headers = json_get(root, "headers");
- JSONROOT jsonBody(szBody);
- OnTrouterEvent(jsonBody, headers);
+ JSONNODE *body = json_parse(szBody);
+ OnTrouterEvent(body, headers);
}
m_TrouterConnection = response->nlc;
|