From 76291cede116104256af9eea2f28e818ee42dd67 Mon Sep 17 00:00:00 2001 From: MikalaiR Date: Fri, 1 May 2015 10:46:02 +0000 Subject: SkypeWeb: Call icon changed. Small optimizations. git-svn-id: http://svn.miranda-ng.org/main/trunk@13328 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/SkypeWeb/res/Icons/call.ico | Bin 5430 -> 33739 bytes protocols/SkypeWeb/src/skype_history_sync.cpp | 12 ++++-------- protocols/SkypeWeb/src/skype_messages.cpp | 1 + protocols/SkypeWeb/src/skype_utils.cpp | 6 +++++- 4 files changed, 10 insertions(+), 9 deletions(-) (limited to 'protocols/SkypeWeb') diff --git a/protocols/SkypeWeb/res/Icons/call.ico b/protocols/SkypeWeb/res/Icons/call.ico index 41e984fc6b..34b6cd7db8 100644 Binary files a/protocols/SkypeWeb/res/Icons/call.ico and b/protocols/SkypeWeb/res/Icons/call.ico differ diff --git a/protocols/SkypeWeb/src/skype_history_sync.cpp b/protocols/SkypeWeb/src/skype_history_sync.cpp index 532fa85b15..ce6a672766 100644 --- a/protocols/SkypeWeb/src/skype_history_sync.cpp +++ b/protocols/SkypeWeb/src/skype_history_sync.cpp @@ -229,20 +229,16 @@ void CSkypeProto::OnSyncHistory(const NETLIBHTTPREQUEST *response) { if (!getByte("AutoSync", 1)) continue; skypename = ContactUrlToName(conversationLink); + MCONTACT hContact = AddContact(skypename, true); + + if (GetMessageFromDb(hContact, clientMsgId, composeTime) == NULL) + PushRequest(new GetHistoryRequest(RegToken, skypename, 100, false, 0, Server), &CSkypeProto::OnGetServerHistory); } else if (conversationLink != NULL && strstr(conversationLink, "/19:")) { skypename = ChatUrlToName(conversationLink); topic = json_as_string(json_get(threadProperties, "topic")); SendRequest(new GetChatInfoRequest(RegToken, skypename, Server), &CSkypeProto::OnGetChatInfo, topic); - continue; } - else - continue; - - MCONTACT hContact = AddContact(skypename, true); - - if (GetMessageFromDb(hContact, clientMsgId, composeTime) == NULL) - PushRequest(new GetHistoryRequest(RegToken, skypename, 100, false, 0, Server), &CSkypeProto::OnGetServerHistory); } } \ No newline at end of file diff --git a/protocols/SkypeWeb/src/skype_messages.cpp b/protocols/SkypeWeb/src/skype_messages.cpp index a1f5605f9b..1e32973535 100644 --- a/protocols/SkypeWeb/src/skype_messages.cpp +++ b/protocols/SkypeWeb/src/skype_messages.cpp @@ -235,6 +235,7 @@ void CSkypeProto::OnPrivateMessageEvent(JSONNODE *node) if (!mir_strcmpi(messageType, "Control/Typing")) CallService(MS_PROTO_CONTACTISTYPING, hContact, PROTOTYPE_CONTACTTYPING_INFINITE); + else if (!mir_strcmpi(messageType, "Control/ClearTyping")) CallService(MS_PROTO_CONTACTISTYPING, hContact, PROTOTYPE_CONTACTTYPING_OFF); diff --git a/protocols/SkypeWeb/src/skype_utils.cpp b/protocols/SkypeWeb/src/skype_utils.cpp index caa126d3d9..cf0219663b 100644 --- a/protocols/SkypeWeb/src/skype_utils.cpp +++ b/protocols/SkypeWeb/src/skype_utils.cpp @@ -464,9 +464,13 @@ void CSkypeProto::ShowNotification(const TCHAR *caption, const TCHAR *message, i ppd.lchContact = hContact; _tcsncpy(ppd.lptzContactName, caption, MAX_CONTACTNAME); _tcsncpy(ppd.lptzText, message, MAX_SECONDLINE); - ppd.lchIcon = Skin_GetIcon("Skype_main"); if (type == SKYPE_DB_EVENT_TYPE_INCOMING_CALL) + { + ppd.lchIcon = Skin_GetIcon("inc_call"); ppd.PluginWindowProc = PopupDlgProcCall; + } + else + ppd.lchIcon = Skin_GetIcon("Skype_main"); if (!PUAddPopupT(&ppd)) return; -- cgit v1.2.3