diff options
| author | MikalaiR <nikolay.romanovich@narod.ru> | 2015-04-29 18:37:46 +0000 |
|---|---|---|
| committer | MikalaiR <nikolay.romanovich@narod.ru> | 2015-04-29 18:37:46 +0000 |
| commit | 36613a6ce15d9614e0883db8303dd2504c70ed4f (patch) | |
| tree | fc344fc883879d45d580de141dcc9594f3e59080 /protocols | |
| parent | 7632fc0137f2eda2cddb02c07a7ad3f987a38e58 (diff) | |
git-svn-id: http://svn.miranda-ng.org/main/trunk@13251 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/SkypeWeb/src/skype_trouter.cpp | 8 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_utils.cpp | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/protocols/SkypeWeb/src/skype_trouter.cpp b/protocols/SkypeWeb/src/skype_trouter.cpp index b5970f8e75..2e0c24d996 100644 --- a/protocols/SkypeWeb/src/skype_trouter.cpp +++ b/protocols/SkypeWeb/src/skype_trouter.cpp @@ -133,10 +133,14 @@ 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);
- ptrT displayname(json_as_string(json_get(jsonBody, "displayname")));
+
+ ptrT displayname(json_as_string(json_get(jsonBody, "displayName")));
ptrT uid(json_as_string(json_get(jsonBody, "conversationId")));
- ShowNotification(displayname, TranslateT("Incoming call"));
+ MCONTACT hContact = FindContact(_T2A(uid));
+ if (uid != NULL)
+ ShowNotification(uid, TranslateT("Incoming call"), 0, hContact);
}
m_TrouterConnection = response->nlc;
diff --git a/protocols/SkypeWeb/src/skype_utils.cpp b/protocols/SkypeWeb/src/skype_utils.cpp index 3d0a945004..85c803cef9 100644 --- a/protocols/SkypeWeb/src/skype_utils.cpp +++ b/protocols/SkypeWeb/src/skype_utils.cpp @@ -462,8 +462,8 @@ void CSkypeProto::ShowNotification(const TCHAR *caption, const TCHAR *message, i {
POPUPDATAT ppd = { 0 };
ppd.lchContact = hContact;
- wcsncpy(ppd.lpwzContactName, caption, MAX_CONTACTNAME);
- wcsncpy(ppd.lpwzText, message, MAX_SECONDLINE);
+ mir_tstrcpy(ppd.lpwzContactName, caption);
+ mir_tstrcpy(ppd.lpwzText, message);
ppd.lchIcon = Skin_GetIcon("Skype_main");
if (!PUAddPopupT(&ppd))
|