From 9536e0bb47b12ea2ae01ab070dd9f6aa5bb360c2 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 29 Dec 2023 17:03:21 +0300 Subject: =?UTF-8?q?fixes=20#4085=20(=D0=A3=D0=B4=D0=B0=D0=BB=D0=B8=D1=82?= =?UTF-8?q?=D1=8C=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B8?= =?UTF-8?q?=20=D0=BD=D0=B5=D0=B2=D0=B8=D0=B4=D0=B8=D0=BC=D0=BE=D1=81=D1=82?= =?UTF-8?q?=D0=B8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/FloatingContacts/src/main.cpp | 2 -- plugins/FloatingContacts/src/thumbs.cpp | 28 ++-------------------------- 2 files changed, 2 insertions(+), 28 deletions(-) (limited to 'plugins/FloatingContacts') diff --git a/plugins/FloatingContacts/src/main.cpp b/plugins/FloatingContacts/src/main.cpp index a1265dba97..21ae19ad5f 100644 --- a/plugins/FloatingContacts/src/main.cpp +++ b/plugins/FloatingContacts/src/main.cpp @@ -228,8 +228,6 @@ static int OnContactSettingChanged(WPARAM hContact, LPARAM lParam) // Only on these 2 events we need to refresh if (0 == strcmp(pdbcws->szSetting, "Status")) idStatus = pdbcws->value.wVal; - else if (0 == strcmp(pdbcws->szSetting, "ApparentMode")) - idStatus = GetContactStatus(hContact); else if (0 == strcmp(pdbcws->szSetting, "Nick")) idStatus = GetContactStatus(hContact); else if (0 == strcmp(pdbcws->szSetting, "MyHandle")) diff --git a/plugins/FloatingContacts/src/thumbs.cpp b/plugins/FloatingContacts/src/thumbs.cpp index 51e7e5d3cd..39da92f65f 100644 --- a/plugins/FloatingContacts/src/thumbs.cpp +++ b/plugins/FloatingContacts/src/thumbs.cpp @@ -247,18 +247,8 @@ void ThumbInfo::ResizeThumb() if (Contact::OnList(hContact)) { char *szProto = Proto_GetBaseAccountName(hContact); if (nullptr != szProto) { - int nStatus = Proto_GetStatus(szProto); int nContactStatus = db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE); - int nApparentMode = db_get_w(hContact, szProto, "ApparentMode", 0); - - if ((nStatus == ID_STATUS_INVISIBLE && nApparentMode == ID_STATUS_ONLINE) || - (nStatus != ID_STATUS_INVISIBLE && nApparentMode == ID_STATUS_OFFLINE)) { - if (ID_STATUS_OFFLINE == nContactStatus) - index = FLT_FONTID_OFFINVIS; - else - index = FLT_FONTID_INVIS; - } - else if (ID_STATUS_OFFLINE == nContactStatus) + if (ID_STATUS_OFFLINE == nContactStatus) index = FLT_FONTID_OFFLINE; else index = FLT_FONTID_CONTACTS; @@ -575,23 +565,9 @@ void ThumbInfo::UpdateContent() if (Contact::OnList(hContact)) { char *szProto = Proto_GetBaseAccountName(hContact); if (nullptr != szProto) { - int nStatus = Proto_GetStatus(szProto); int nContactStatus = db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE); - int nApparentMode = db_get_w(hContact, szProto, "ApparentMode", 0); - - if ((nStatus == ID_STATUS_INVISIBLE && nApparentMode == ID_STATUS_ONLINE) || - (nStatus != ID_STATUS_INVISIBLE && nApparentMode == ID_STATUS_OFFLINE)) { - if (ID_STATUS_OFFLINE == nContactStatus) - index = FLT_FONTID_OFFINVIS; - else { - index = FLT_FONTID_INVIS; - if (fcOpt.bShowIdle && db_get_dw(hContact, szProto, "IdleTS", 0)) - fStyle |= ILD_BLEND50; - } - } - else if (ID_STATUS_OFFLINE == nContactStatus) { + if (ID_STATUS_OFFLINE == nContactStatus) index = FLT_FONTID_OFFLINE; - } else { index = FLT_FONTID_CONTACTS; if (fcOpt.bShowIdle && db_get_dw(hContact, szProto, "IdleTS", 0)) -- cgit v1.2.3