From 2604dd1a9f41a7485c87f0edc64dfe5fa1df81ba Mon Sep 17 00:00:00 2001 From: MikalaiR Date: Fri, 7 Aug 2015 06:18:27 +0000 Subject: SkypeWeb: fix auth request duplication git-svn-id: http://svn.miranda-ng.org/main/trunk@14851 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/SkypeWeb/src/skype_contacts.cpp | 2 +- protocols/SkypeWeb/src/skype_options.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'protocols/SkypeWeb') diff --git a/protocols/SkypeWeb/src/skype_contacts.cpp b/protocols/SkypeWeb/src/skype_contacts.cpp index cbe321b7d2..d2ac6f323a 100644 --- a/protocols/SkypeWeb/src/skype_contacts.cpp +++ b/protocols/SkypeWeb/src/skype_contacts.cpp @@ -135,7 +135,7 @@ void CSkypeProto::LoadContactsAuth(const NETLIBHTTPREQUEST *response) { time_t lastEventTime = db_get_dw(hContact, m_szModuleName, "LastAuthRequestTime", 0); - if (lastEventTime == 0 || lastEventTime < eventTime) + if (lastEventTime == 0 || lastEventTime <= eventTime) { db_set_dw(hContact, m_szModuleName, "LastAuthRequestTime", eventTime); delSetting(hContact, "Auth"); diff --git a/protocols/SkypeWeb/src/skype_options.cpp b/protocols/SkypeWeb/src/skype_options.cpp index dc408ca9e8..c78dd53aed 100644 --- a/protocols/SkypeWeb/src/skype_options.cpp +++ b/protocols/SkypeWeb/src/skype_options.cpp @@ -42,7 +42,7 @@ void CSkypeOptionsMain::OnInitDialog() CSkypeDlgBase::OnInitDialog(); m_skypename.SetTextA(ptrA(m_proto->getStringA(SKYPE_SETTINGS_ID))); - m_password.SetTextA(ptrA(m_proto->getStringA("Password"))); + m_password.SetTextA(pass_ptrA(m_proto->getStringA("Password"))); m_place.Enable(!m_proto->getBool("UseHostName", false)); SendMessage(m_skypename.GetHwnd(), EM_LIMITTEXT, 32, 0); SendMessage(m_password.GetHwnd(), EM_LIMITTEXT, 128, 0); @@ -56,7 +56,6 @@ void CSkypeOptionsMain::OnApply() szOldSkypename(m_proto->getStringA(SKYPE_SETTINGS_ID)); pass_ptrA szNewPassword(m_password.GetTextA()), szOldPassword(m_proto->getStringA("Password")); - if (mir_strcmpi(szNewSkypename, szOldSkypename) || mir_strcmp(szNewPassword, szOldPassword)) m_proto->delSetting("TokenExpiresIn"); m_proto->setString(SKYPE_SETTINGS_ID, szNewSkypename); -- cgit v1.2.3