fixes #4085 (Удалить настройки невидимости)

6 files changed, 1 insertions, 27 deletions

diff --git a/plugins/Clist_modern/src/modern_awaymsg.cpp b/plugins/Clist_modern/src/modern_awaymsg.cpp
index cf8897d329..caada9b0dc 100644
--- a/plugins/Clist_modern/src/modern_awaymsg.cpp
+++ b/plugins/Clist_modern/src/modern_awaymsg.cpp
@@ -90,9 +90,7 @@ static void amThreadProc(void *)
 

 			ClcCacheEntry *pdnce = Clist_GetCacheEntry(hContact);

 

-			HANDLE ACK = nullptr;

-			if (pdnce->ApparentMode != ID_STATUS_OFFLINE) //don't ask if contact is always invisible (should be done with protocol)

-				ACK = (HANDLE)ProtoChainSend(hContact, PSS_GETAWAYMSG, 0, 0);

+			HANDLE ACK = (HANDLE)ProtoChainSend(hContact, PSS_GETAWAYMSG, 0, 0);

 			if (!ACK) {

 				ACKDATA ack;

 				ack.hContact = hContact;

diff --git a/plugins/Clist_modern/src/modern_clc.h b/plugins/Clist_modern/src/modern_clc.h
index 4d06174025..9245fae6aa 100644
--- a/plugins/Clist_modern/src/modern_clc.h
+++ b/plugins/Clist_modern/src/modern_clc.h
@@ -94,8 +94,6 @@ void clcSetDelayTimer(UINT_PTR uIDEvent, HWND hwnd, int nDelay = -1);
 #define DROPTARGET_ONSUBCONTACT  7

 

 #define CONTACTF_ONLINE    1

-#define CONTACTF_INVISTO   2

-#define CONTACTF_VISTO     4

 #define CONTACTF_NOTONLIST 8

 #define CONTACTF_CHECKED   16

 #define CONTACTF_IDLE      32

diff --git a/plugins/Clist_modern/src/modern_clcitems.cpp b/plugins/Clist_modern/src/modern_clcitems.cpp
index 8ee400d56b..cb958b7857 100644
--- a/plugins/Clist_modern/src/modern_clcitems.cpp
+++ b/plugins/Clist_modern/src/modern_clcitems.cpp
@@ -75,10 +75,6 @@ void AddSubcontacts(ClcData *dat, ClcContact *cont, BOOL showOfflineHereGroup)
 		char *szProto = pdnce->szProto;

 		if (szProto != nullptr && !Clist_IsHiddenMode(dat, wStatus))

 			p.flags |= CONTACTF_ONLINE;

-		int apparentMode = szProto != nullptr ? pdnce->ApparentMode : 0;

-		if (apparentMode == ID_STATUS_OFFLINE)	p.flags |= CONTACTF_INVISTO;

-		else if (apparentMode == ID_STATUS_ONLINE) p.flags |= CONTACTF_VISTO;

-		else if (apparentMode) p.flags |= CONTACTF_VISTO | CONTACTF_INVISTO;

 		if (pdnce->NotOnList) p.flags |= CONTACTF_NOTONLIST;

 		int idleMode = szProto != nullptr ? pdnce->IdleTS : 0;

 		if (idleMode) p.flags |= CONTACTF_IDLE;

@@ -132,19 +128,6 @@ static void _LoadDataToContact(ClcContact *cont, ClcCacheEntry *pdnce, ClcGroup
 	if (szProto != nullptr && !Clist_IsHiddenMode(dat, pdnce->m_iStatus))

 		cont->flags |= CONTACTF_ONLINE;

 

-	uint16_t apparentMode = szProto != nullptr ? pdnce->ApparentMode : 0;

-	if (apparentMode)

-		switch (apparentMode) {

-		case ID_STATUS_OFFLINE:

-			cont->flags |= CONTACTF_INVISTO;

-			break;

-		case ID_STATUS_ONLINE:

-			cont->flags |= CONTACTF_VISTO;

-			break;

-		default:

-			cont->flags |= CONTACTF_VISTO | CONTACTF_INVISTO;

-		}

-

 	if (pdnce->NotOnList)

 		cont->flags |= CONTACTF_NOTONLIST;

 

@@ -331,7 +314,6 @@ ClcCacheEntry* cliCreateCacheItem(MCONTACT hContact)
 	pdnce->m_bIsSub = db_mc_isSub(hContact) != 0;

 	pdnce->m_bNoHiddenOffline = g_plugin.getByte(hContact, "noOffline");

 	pdnce->IdleTS = db_get_dw(hContact, pdnce->szProto, "IdleTS", 0);

-	pdnce->ApparentMode = db_get_w(hContact, pdnce->szProto, "ApparentMode", 0);

 	pdnce->NotOnList = !Contact::OnList(hContact);

 	pdnce->IsExpanded = g_plugin.getByte(hContact, "Expanded");

 	pdnce->dwLastOnlineTime = db_get_dw(hContact, pdnce->szProto, "LastSeen", 0);

diff --git a/plugins/Clist_modern/src/modern_clist.h b/plugins/Clist_modern/src/modern_clist.h
index c04ab2562b..e794394c05 100644
--- a/plugins/Clist_modern/src/modern_clist.h
+++ b/plugins/Clist_modern/src/modern_clist.h
@@ -79,7 +79,6 @@ struct ClcCacheEntry : public ClcCacheEntryBase
 	bool     m_bIsSub;

 	bool     m_bIsUnknown;

 

-	int      ApparentMode;

 	int      NotOnList;

 	int      IdleTS;

 	void*    ClcContact;

diff --git a/plugins/Clist_modern/src/modern_clistsettings.cpp b/plugins/Clist_modern/src/modern_clistsettings.cpp
index 0f5ea19bb5..24bea1d207 100644
--- a/plugins/Clist_modern/src/modern_clistsettings.cpp
+++ b/plugins/Clist_modern/src/modern_clistsettings.cpp
@@ -147,8 +147,6 @@ int ContactSettingChanged(WPARAM hContact, LPARAM lParam)
 			if ((g_plugin.secondLine.getType() == TEXT_STATUS_MESSAGE || g_plugin.thirdLine.getType() == TEXT_STATUS_MESSAGE) && pdnce->hContact && pdnce->szProto)

 				amRequestAwayMsg(hContact);

 		}

-		else if (!strcmp(cws->szSetting, "ApparentMode"))

-			pdnce->ApparentMode = cws->value.wVal;

 		else if (!strcmp(cws->szSetting, "IdleTS"))

 			pdnce->IdleTS = cws->value.dVal;

 		else if (!strcmp(cws->szSetting, "IsSubcontact")) {

diff --git a/plugins/Clist_modern/src/resource.h b/plugins/Clist_modern/src/resource.h
index 4d98b08646..8e46e99484 100644
--- a/plugins/Clist_modern/src/resource.h
+++ b/plugins/Clist_modern/src/resource.h
@@ -32,7 +32,6 @@
 #define IDI_FILLEDBLOB                  212

 #define IDI_EMPTYBLOB                   213

 #define IDD_OPT_IGNORE                  214

-#define IDD_OPT_VISIBILITY              215

 #define IDC_DROPUSER                    215

 #define IDI_DETAILSLOGO                 216

 #define IDI_HIDE_AVATAR                 217