diff options
| author | MikalaiR <nikolay.romanovich@narod.ru> | 2015-05-05 18:46:59 +0000 |
|---|---|---|
| committer | MikalaiR <nikolay.romanovich@narod.ru> | 2015-05-05 18:46:59 +0000 |
| commit | a9fbb37488cf2f7d8198277aba80c55517cad092 (patch) | |
| tree | cf9b0f9fb49563bda29febad1572316ea95f8c97 /protocols | |
| parent | fc946bfa82e2af4b54bf45b20dbd58b03b26a5b1 (diff) | |
SkypeWeb: Correct version of rev.[13449].
git-svn-id: http://svn.miranda-ng.org/main/trunk@13450 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/SkypeWeb/src/skype_messages.cpp | 10 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_options.cpp | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/protocols/SkypeWeb/src/skype_messages.cpp b/protocols/SkypeWeb/src/skype_messages.cpp index 985e0f2f4d..8191308b85 100644 --- a/protocols/SkypeWeb/src/skype_messages.cpp +++ b/protocols/SkypeWeb/src/skype_messages.cpp @@ -334,7 +334,7 @@ void CSkypeProto::OnPrivateMessageEvent(JSONNODE *node) {
for (int i=0; i < xi.getChildCount(xml); i++)
{
- int fileSize; CMStringA msg = "";
+ int fileSize;
HXML xmlNode = xi.getNthChild(xml, L"file", i);
if (xmlNode == NULL)
break;
@@ -343,14 +343,16 @@ void CSkypeProto::OnPrivateMessageEvent(JSONNODE *node) if (fileName == NULL || fileSize == NULL)
continue;
- msg.Empty();
- msg.AppendFormat("%s:\n\t%s: %s\n\t%s: %d %s", Translate("File transfer"), Translate("File name"), fileName, Translate("Size"), fileSize , Translate("bytes"));
+ CMStringA msg(FORMAT, "%s:\n\t%s: %s\n\t%s: %d %s", Translate("File transfer"), Translate("File name"), fileName, Translate("Size"), fileSize , Translate("bytes"));
AddMessageToDb(hContact, timestamp, DBEF_UTF | DBEF_READ, clientMsgId, msg.GetBuffer());
}
}
}
else if (!mir_strcmpi(messageType, "RichText/Location")){}
- else if (!mir_strcmpi(messageType, "RichText/UriObject")){} //Picture
+ else if (!mir_strcmpi(messageType, "RichText/UriObject"))
+ {
+
+ } //Picture
else if (!mir_strcmpi(messageType, "RichText/Contacts")){}
}
diff --git a/protocols/SkypeWeb/src/skype_options.cpp b/protocols/SkypeWeb/src/skype_options.cpp index 91e81796a8..c90bc738c1 100644 --- a/protocols/SkypeWeb/src/skype_options.cpp +++ b/protocols/SkypeWeb/src/skype_options.cpp @@ -45,7 +45,7 @@ void CSkypeOptionsMain::OnInitDialog() void CSkypeOptionsMain::OnApply()
{
- if (m_proto->getStringA(SKYPE_SETTINGS_ID) != m_skypename.GetTextA() || m_proto->getStringA("Password") != m_password.GetTextA())
+ if (mir_strcmpi(m_proto->getStringA(SKYPE_SETTINGS_ID), m_skypename.GetTextA()) || mir_strcmpi(m_proto->getStringA("Password"), m_password.GetTextA()))
m_proto->delSetting("TokenExpiresIn");
m_proto->setString(SKYPE_SETTINGS_ID, m_skypename.GetTextA());
m_proto->setString("Password", m_password.GetTextA());
|