diff options
| author | MikalaiR <nikolay.romanovich@narod.ru> | 2015-05-01 18:24:18 +0000 |
|---|---|---|
| committer | MikalaiR <nikolay.romanovich@narod.ru> | 2015-05-01 18:24:18 +0000 |
| commit | ea1c72e6742777aae4f7cb2602006c0ef8cce1ed (patch) | |
| tree | 404bc013c1064f570a91b5a90a4f93cc1a9d8327 /protocols/SkypeWeb/src/skype_trouter.cpp | |
| parent | 4e93c5f05bd29c94859d048cfba2d1518d23b28b (diff) | |
SkypeWeb: Small fixes.
git-svn-id: http://svn.miranda-ng.org/main/trunk@13343 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/SkypeWeb/src/skype_trouter.cpp')
| -rw-r--r-- | protocols/SkypeWeb/src/skype_trouter.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/protocols/SkypeWeb/src/skype_trouter.cpp b/protocols/SkypeWeb/src/skype_trouter.cpp index c89e184fad..3f76c3e731 100644 --- a/protocols/SkypeWeb/src/skype_trouter.cpp +++ b/protocols/SkypeWeb/src/skype_trouter.cpp @@ -92,6 +92,7 @@ void CSkypeProto::OnHealth(const NETLIBHTTPREQUEST*) void CSkypeProto::OnTrouterEvent(JSONNODE *body, JSONNODE *headers)
{
ptrT displayname(json_as_string(json_get(body, "displayName")));
+ ptrT cuid(json_as_string(json_get(body, "callerId")));
ptrT uid(json_as_string(json_get(body, "conversationId")));
ptrA callId(mir_t2a(ptrT(json_as_string(json_get(body, "callId")))));
int evt = json_as_int(json_get(body, "evt"));
@@ -126,7 +127,7 @@ void CSkypeProto::OnTrouterEvent(JSONNODE *body, JSONNODE *headers) }
break;
}
- case 104: //call canceled
+ case 104: //call canceled: callerId=""; conversationId=NULL; callId=call id
{
break;
}
@@ -185,11 +186,6 @@ void CSkypeProto::TRouterThread(void*) CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT, 0, (LPARAM)response);
delete request;
}
-
- if (!isTerminated)
- {
- debugLogA(__FUNCTION__": unexpected termination; switching protocol to offline");
- }
m_hTrouterThread = NULL;
m_TrouterConnection = NULL;
debugLogA(__FUNCTION__": leaving");
@@ -213,7 +209,9 @@ INT_PTR CSkypeProto::OnIncomingCallPP(WPARAM wParam, LPARAM hContact) break;
}
}
+
if (wParam == 1)
NotifyEventHooks(m_hCallHook, (WPARAM)hContact, (LPARAM)0);
+
return 0;
}
\ No newline at end of file |