diff options
Diffstat (limited to 'protocols/SkypeWeb')
| -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))
|