diff options
| author | MikalaiR <nikolay.romanovich@narod.ru> | 2015-09-21 12:09:25 +0000 |
|---|---|---|
| committer | MikalaiR <nikolay.romanovich@narod.ru> | 2015-09-21 12:09:25 +0000 |
| commit | a8af09a3f64f5cb1b7417977ed8265b5a97e4107 (patch) | |
| tree | ab3d71903d4cee74eb1b6ec15a4a483188565523 | |
| parent | cec8996acb962a45d7c0549cd6da73a4625cc070 (diff) | |
SkypeWeb: attempt o remove crutches
git-svn-id: http://svn.miranda-ng.org/main/trunk@15417 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | protocols/SkypeWeb/src/requests/messages.h | 4 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_messages.cpp | 2 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_utils.cpp | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/protocols/SkypeWeb/src/requests/messages.h b/protocols/SkypeWeb/src/requests/messages.h index 104632ecfd..6d496c811b 100644 --- a/protocols/SkypeWeb/src/requests/messages.h +++ b/protocols/SkypeWeb/src/requests/messages.h @@ -31,7 +31,7 @@ public: JSONNode node;
node
- << JSONNode("clientmessageid", CMStringA(::FORMAT, "%llu000", (ULONGLONG)timestamp))
+ << JSONNode("clientmessageid", CMStringA(::FORMAT, "%llu", (ULONGLONG)timestamp))
<< JSONNode("messagetype", "Text")
<< JSONNode("contenttype", "text")
<< JSONNode("content", message);
@@ -56,7 +56,7 @@ public: JSONNode node;
node
- << JSONNode("clientmessageid", CMStringA(::FORMAT, "%llu000", (ULONGLONG)timestamp))
+ << JSONNode("clientmessageid", CMStringA(::FORMAT, "%llu", (ULONGLONG)timestamp))
<< JSONNode("messagetype", "RichText")
<< JSONNode("contenttype", "text")
<< JSONNode("content", content)
diff --git a/protocols/SkypeWeb/src/skype_messages.cpp b/protocols/SkypeWeb/src/skype_messages.cpp index 6c22ae55b1..e8140392af 100644 --- a/protocols/SkypeWeb/src/skype_messages.cpp +++ b/protocols/SkypeWeb/src/skype_messages.cpp @@ -186,8 +186,6 @@ void CSkypeProto::OnPrivateMessageEvent(const JSONNode &node) {
if (IsMe(szFromSkypename))
{
- if (szMessageId.GetLength() && szMessageId[szMessageId.GetLength() - 1] == '0' && szMessageId[szMessageId.GetLength() - 2] == '0' && szMessageId[szMessageId.GetLength() - 3] == '0')
- szMessageId.Truncate(szMessageId.GetLength() - 3);
HANDLE hMessage = (HANDLE)(std::stoull(szMessageId.GetString()));
if (m_OutMessages.getIndex(hMessage) != -1)
{
diff --git a/protocols/SkypeWeb/src/skype_utils.cpp b/protocols/SkypeWeb/src/skype_utils.cpp index f7f287fd04..facee0f44d 100644 --- a/protocols/SkypeWeb/src/skype_utils.cpp +++ b/protocols/SkypeWeb/src/skype_utils.cpp @@ -535,13 +535,13 @@ INT_PTR CSkypeProto::ParseSkypeUriService(WPARAM, LPARAM lParam) MCONTACT hContact = FindContact(_T2A(szJid));
if (hContact == NULL)
{
- PROTOSEARCHRESULT psr;
+ PROTOSEARCHRESULT psr = { 0 };
psr.cbSize = sizeof(psr);
psr.id.t = mir_tstrdup(szJid);
psr.nick.t = mir_tstrdup(szJid);
psr.flags = PSR_UNICODE;
- ADDCONTACTSTRUCT acs;
+ ADDCONTACTSTRUCT acs = { 0 };
acs.handleType = HANDLE_SEARCHRESULT;
acs.szProto = m_szModuleName;
acs.psr = &psr;
|