From ee9362920d1f0e3f7e6a76d15d957247f013cb8e Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 28 Aug 2024 17:41:58 +0300 Subject: =?UTF-8?q?fixes=20#4598=20(SkypeWeb:=20=D0=9D=D0=B5=20=D0=BE?= =?UTF-8?q?=D1=82=D0=BA=D1=80=D1=8B=D0=B2=D0=B0=D0=B5=D1=82=D1=81=D1=8F=20?= =?UTF-8?q?=D1=81=D0=B5=D1=81=D1=81=D0=B8=D1=8F=20=D1=81=D0=BE=D0=BE=D0=B1?= =?UTF-8?q?=D1=89=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=B8=20=D0=BD=D0=B5=20=D0=BF?= =?UTF-8?q?=D0=BE=D1=8F=D0=B2=D0=BB=D1=8F=D0=B5=D1=82=D1=81=D1=8F=20=D1=83?= =?UTF-8?q?=D0=B2=D0=B5=D0=B4=D0=BE=D0=BC=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20?= =?UTF-8?q?=D0=BE=20=D0=BD=D0=BE=D0=B2=D1=8B=D1=85=20=D1=81=D0=BE=D0=BE?= =?UTF-8?q?=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D1=8F=D1=85)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protocols/SkypeWeb/src/skype_history_sync.cpp | 6 ++++-- protocols/SkypeWeb/src/skype_options.cpp | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'protocols/SkypeWeb/src') diff --git a/protocols/SkypeWeb/src/skype_history_sync.cpp b/protocols/SkypeWeb/src/skype_history_sync.cpp index 3ce3d1c028..146b925ba2 100644 --- a/protocols/SkypeWeb/src/skype_history_sync.cpp +++ b/protocols/SkypeWeb/src/skype_history_sync.cpp @@ -32,7 +32,8 @@ void CSkypeProto::OnGetServerHistory(MHttpResponse *response, AsyncHttpRequest * int totalCount = metadata["totalCount"].as_int(); std::string syncState = metadata["syncState"].as_string(); - bool bUseLocalTime = !bUseServerTime && pRequest->pUserInfo != 0; + bool bOperative = pRequest->pUserInfo != 0; + bool bUseLocalTime = !bUseServerTime && bOperative; bool bSetLastTime = false; int64_t lastMsgTime = 0; // max timestamp on this page @@ -64,7 +65,8 @@ void CSkypeProto::OnGetServerHistory(MHttpResponse *response, AsyncHttpRequest * } dbei.flags = DBEF_UTF; - dbei.flags |= DBEF_READ; + if (!bOperative) + dbei.flags |= DBEF_READ; if (IsMe(szFrom)) dbei.flags |= DBEF_SENT; diff --git a/protocols/SkypeWeb/src/skype_options.cpp b/protocols/SkypeWeb/src/skype_options.cpp index 84c1c04966..f5d3f5dee5 100644 --- a/protocols/SkypeWeb/src/skype_options.cpp +++ b/protocols/SkypeWeb/src/skype_options.cpp @@ -45,8 +45,6 @@ public: bool OnInitDialog() override { - CSkypeDlgBase::OnInitDialog(); - m_skypename.SetTextA(ptrA(m_proto->getStringA(SKYPE_SETTINGS_ID))); m_password.SetTextA(pass_ptrA(m_proto->getStringA("Password"))); m_place.Enable(!m_proto->bUseHostnameAsPlace); -- cgit v1.2.3