diff options
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/SkypeWeb/res/Icons/call.ico | bin | 5430 -> 33739 bytes | |||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_history_sync.cpp | 12 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_messages.cpp | 1 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_utils.cpp | 6 |
4 files changed, 10 insertions, 9 deletions
diff --git a/protocols/SkypeWeb/res/Icons/call.ico b/protocols/SkypeWeb/res/Icons/call.ico Binary files differindex 41e984fc6b..34b6cd7db8 100644 --- a/protocols/SkypeWeb/res/Icons/call.ico +++ b/protocols/SkypeWeb/res/Icons/call.ico 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;
|