diff options
Diffstat (limited to 'protocols')
-rw-r--r-- | protocols/SkypeWeb/src/skype_contacts.cpp | 1 | ||||
-rw-r--r-- | protocols/SkypeWeb/src/skype_history_sync.cpp | 7 | ||||
-rw-r--r-- | protocols/SkypeWeb/src/skype_messages.cpp | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/protocols/SkypeWeb/src/skype_contacts.cpp b/protocols/SkypeWeb/src/skype_contacts.cpp index 84a46cf912..fd89fa0bca 100644 --- a/protocols/SkypeWeb/src/skype_contacts.cpp +++ b/protocols/SkypeWeb/src/skype_contacts.cpp @@ -117,6 +117,7 @@ void CSkypeProto::LoadContactsAuth(const NETLIBHTTPREQUEST *response) JSONNODE *node = json_get(root, "greeting");
CMStringA reason = ptrA(mir_t2a(ptrT(json_as_string(node))));
+
if (reason != "null")
reason.Empty();
diff --git a/protocols/SkypeWeb/src/skype_history_sync.cpp b/protocols/SkypeWeb/src/skype_history_sync.cpp index 7b1607a834..1e4f4641fb 100644 --- a/protocols/SkypeWeb/src/skype_history_sync.cpp +++ b/protocols/SkypeWeb/src/skype_history_sync.cpp @@ -83,7 +83,12 @@ void CSkypeProto::OnGetServerHistory(const NETLIBHTTPREQUEST *response) mir_strcpy(dbMsgText, (char*)dbei.pBlob);
- msg.AppendFormat("%s\n%s [%s]:\n%s", dbMsgText, Translate("Edited at"), ptrA(mir_t2a(composeTime)), message);
+ TCHAR time[64];
+ _locale_t locale = _create_locale(LC_ALL, "");
+ _tcsftime_l(time, sizeof(time), L"%X %x", localtime(×tamp), locale);
+ _free_locale(locale);
+
+ msg.AppendFormat("%s\n%s %s:\n%s", dbMsgText, Translate("Edited at"), _T2A(time), message);
db_event_delete(hContact, dbevent);
AddMessageToDb(hContact, dbEventTimestamp, flags, clientMsgId, msg.GetBuffer(), emoteOffset);
}
diff --git a/protocols/SkypeWeb/src/skype_messages.cpp b/protocols/SkypeWeb/src/skype_messages.cpp index 09cf9a1cea..8177d9c9f7 100644 --- a/protocols/SkypeWeb/src/skype_messages.cpp +++ b/protocols/SkypeWeb/src/skype_messages.cpp @@ -255,10 +255,10 @@ void CSkypeProto::OnPrivateMessageEvent(JSONNODE *node) TCHAR time[64];
_locale_t locale = _create_locale(LC_ALL, "");
- _tcsftime_l(time, sizeof(time), L"%x %X", localtime(×tamp), locale);
+ _tcsftime_l(time, sizeof(time), L"%X %x", localtime(×tamp), locale);
_free_locale(locale);
- msg.AppendFormat("%s\n%s [%s]:\n%s", dbMsgText, Translate("Edited at"), _T2A(time), message);
+ msg.AppendFormat("%s\n%s %s:\n%s", dbMsgText, Translate("Edited at"), _T2A(time), message);
db_event_delete(hContact, dbevent);
AddMessageToDb(hContact, dbEventTimestamp, DBEF_UTF, skypeEditedId, msg.GetBuffer());
}
|