From 3a6ef3d8eebca078ff3eb424d56d483d256f4567 Mon Sep 17 00:00:00 2001 From: MikalaiR Date: Thu, 30 Apr 2015 18:03:20 +0000 Subject: SkypeWeb: Popup on incoming call. git-svn-id: http://svn.miranda-ng.org/main/trunk@13296 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/SkypeWeb/src/skype_trouter.cpp | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'protocols/SkypeWeb/src/skype_trouter.cpp') diff --git a/protocols/SkypeWeb/src/skype_trouter.cpp b/protocols/SkypeWeb/src/skype_trouter.cpp index 03f04e7a35..169b2962f4 100644 --- a/protocols/SkypeWeb/src/skype_trouter.cpp +++ b/protocols/SkypeWeb/src/skype_trouter.cpp @@ -107,13 +107,15 @@ void CSkypeProto::OnTrouterEvent(JSONNODE *body, JSONNODE *headers) cle.lParam = SKYPE_DB_EVENT_TYPE_INCOMING_CALL; cle.hIcon = Skin_GetIconByHandle(GetIconHandle("inc_call")); - CMStringA service(FORMAT, "%s/IncomingCall", GetContactProto(hContact)); + CMStringA service(FORMAT, "%s/IncomingCallCLE", GetContactProto(hContact)); cle.pszService = service.GetBuffer(); CMString tooltip(FORMAT, TranslateT("Incoming call from %s"), pcli->pfnGetContactDisplayName(hContact, 0)); cle.ptszTooltip = tooltip.GetBuffer(); CallService(MS_CLIST_ADDEVENT, 0, (LPARAM)&cle); + + ShowNotification(pcli->pfnGetContactDisplayName(hContact, 0), TranslateT("Incoming call"), 0, hContact, SKYPE_DB_EVENT_TYPE_INCOMING_CALL); } } @@ -179,9 +181,24 @@ void CSkypeProto::TRouterThread(void*) debugLogA(__FUNCTION__": leaving"); } -INT_PTR CSkypeProto::OnIncomingCall(WPARAM wParam, LPARAM lParam) +INT_PTR CSkypeProto::OnIncomingCallCLE(WPARAM wParam, LPARAM lParam) { CLISTEVENT *cle = (CLISTEVENT*)lParam; NotifyEventHooks(m_hCallHook, (WPARAM)cle->hContact, (LPARAM)0); return 0; +} + +INT_PTR CSkypeProto::OnIncomingCallPP(WPARAM wParam, LPARAM hContact) +{ + CLISTEVENT *cle = NULL; + while ((cle = (CLISTEVENT*)CallService(MS_CLIST_GETEVENT, hContact, 0))) + { + if (cle->lParam == SKYPE_DB_EVENT_TYPE_INCOMING_CALL) + { + CallService(MS_CLIST_REMOVEEVENT, hContact, cle->hDbEvent); + break; + } + } + NotifyEventHooks(m_hCallHook, (WPARAM)cle->hContact, (LPARAM)0); + return 0; } \ No newline at end of file -- cgit v1.2.3