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

4 files changed, 1 insertions, 22 deletions

diff --git a/plugins/TipperYM/src/options.cpp b/plugins/TipperYM/src/options.cpp
index 2cd292dd53..175e9d1ded 100644
--- a/plugins/TipperYM/src/options.cpp
+++ b/plugins/TipperYM/src/options.cpp
@@ -619,7 +619,6 @@ void LoadOptions()
 	// extra setting

 	opt.bWaitForContent = g_plugin.getByte("WaitForContent", 0) ? true : false;

 	opt.bGetNewStatusMsg = g_plugin.getByte("GetNewStatusMsg", 0) ? true : false;

-	opt.bDisableIfInvisible = g_plugin.getByte("DisableInvisible", 1) ? true : false;

 	opt.bRetrieveXstatus = g_plugin.getByte("RetrieveXStatus", 0) ? true : false;

 	opt.bOriginalAvatarSize = g_plugin.getByte("OriginalAvSize", 0) ? true : false;

 	opt.bAvatarBorder = g_plugin.getByte("AvatarBorder", 0) ? true : false;

@@ -1587,15 +1586,12 @@ INT_PTR CALLBACK DlgProcOptsExtra(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 

 		CheckDlgButton(hwndDlg, IDC_CHK_WAITFORCONTENT, opt.bWaitForContent ? BST_CHECKED : BST_UNCHECKED);

 		CheckDlgButton(hwndDlg, IDC_CHK_GETSTATUSMSG, opt.bGetNewStatusMsg ? BST_CHECKED : BST_UNCHECKED);

-		CheckDlgButton(hwndDlg, IDC_CHK_DISABLEINVISIBLE, opt.bDisableIfInvisible ? BST_CHECKED : BST_UNCHECKED);

 		CheckDlgButton(hwndDlg, IDC_CHK_RETRIEVEXSTATUS, opt.bRetrieveXstatus ? BST_CHECKED : BST_UNCHECKED);

 		CheckDlgButton(hwndDlg, IDC_CHK_LIMITMSG, opt.bLimitMsg ? BST_CHECKED : BST_UNCHECKED);

 		CheckDlgButton(hwndDlg, IDC_CHK_ENABLESMILEYS, opt.iSmileyAddFlags & SMILEYADD_ENABLE ? BST_CHECKED : BST_UNCHECKED);

 		CheckDlgButton(hwndDlg, IDC_CHK_USEPROTOSMILEYS, opt.iSmileyAddFlags & SMILEYADD_USEPROTO ? BST_CHECKED : BST_UNCHECKED);

 		CheckDlgButton(hwndDlg, IDC_CHK_ONLYISOLATED, opt.iSmileyAddFlags & SMILEYADD_ONLYISOLATED ? BST_CHECKED : BST_UNCHECKED);

 		CheckDlgButton(hwndDlg, IDC_CHK_RESIZESMILEYS, opt.iSmileyAddFlags & SMILEYADD_RESIZE ? BST_CHECKED : BST_UNCHECKED);

-

-		EnableWindow(GetDlgItem(hwndDlg, IDC_CHK_DISABLEINVISIBLE), opt.bGetNewStatusMsg);

 		{

 			BOOL bEnable = opt.iSmileyAddFlags & SMILEYADD_ENABLE;

 			EnableWindow(GetDlgItem(hwndDlg, IDC_CHK_USEPROTOSMILEYS), bEnable);

@@ -1646,10 +1642,6 @@ INT_PTR CALLBACK DlgProcOptsExtra(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 		case IDC_CHK_LIMITMSG:

 			EnableWindow(GetDlgItem(hwndDlg, IDC_ED_CHARCOUNT), IsDlgButtonChecked(hwndDlg, IDC_CHK_LIMITMSG));

 			break;

-

-		case IDC_CHK_GETSTATUSMSG:

-			EnableWindow(GetDlgItem(hwndDlg, IDC_CHK_DISABLEINVISIBLE), IsDlgButtonChecked(hwndDlg, IDC_CHK_GETSTATUSMSG));

-			break;

 		}

 

 		if ((HIWORD(wParam) == BN_CLICKED || HIWORD(wParam) == EN_CHANGE) && (HWND)lParam == GetFocus())

@@ -1683,7 +1675,6 @@ INT_PTR CALLBACK DlgProcOptsExtra(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 

 				opt.bWaitForContent = IsDlgButtonChecked(hwndDlg, IDC_CHK_WAITFORCONTENT) ? true : false;

 				opt.bGetNewStatusMsg = IsDlgButtonChecked(hwndDlg, IDC_CHK_GETSTATUSMSG) ? true : false;

-				opt.bDisableIfInvisible = IsDlgButtonChecked(hwndDlg, IDC_CHK_DISABLEINVISIBLE) ? true : false;

 				opt.bRetrieveXstatus = IsDlgButtonChecked(hwndDlg, IDC_CHK_RETRIEVEXSTATUS) ? true : false;

 				opt.bLimitMsg = IsDlgButtonChecked(hwndDlg, IDC_CHK_LIMITMSG) ? true : false;

 				opt.iLimitCharCount = GetDlgItemInt(hwndDlg, IDC_ED_CHARCOUNT, nullptr, FALSE);

@@ -1691,7 +1682,6 @@ INT_PTR CALLBACK DlgProcOptsExtra(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 				g_plugin.setDword("SmileyAddFlags", opt.iSmileyAddFlags);

 				g_plugin.setByte("WaitForContent", opt.bWaitForContent ? 1 : 0);

 				g_plugin.setByte("GetNewStatusMsg", opt.bGetNewStatusMsg ? 1 : 0);

-				g_plugin.setByte("DisableInvisible", opt.bDisableIfInvisible ? 1 : 0);

 				g_plugin.setByte("RetrieveXStatus", opt.bRetrieveXstatus ? 1 : 0);

 				g_plugin.setByte("LimitMsg", opt.bLimitMsg ? 1 : 0);

 				g_plugin.setByte("LimitCharCount", opt.iLimitCharCount);

diff --git a/plugins/TipperYM/src/options.h b/plugins/TipperYM/src/options.h
index fe3a491f12..cb949ab316 100644
--- a/plugins/TipperYM/src/options.h
+++ b/plugins/TipperYM/src/options.h
@@ -153,7 +153,6 @@ struct OPTIONS
 	bool bAvatarBorder;

 	bool bWaitForContent;

 	bool bGetNewStatusMsg;

-	bool bDisableIfInvisible;

 	bool bRetrieveXstatus;

 	bool bLimitMsg;

 	int iLimitCharCount;

diff --git a/plugins/TipperYM/src/resource.h b/plugins/TipperYM/src/resource.h
index e3f053db01..3555d9b572 100644
--- a/plugins/TipperYM/src/resource.h
+++ b/plugins/TipperYM/src/resource.h
@@ -84,7 +84,6 @@
 #define IDC_CMB_VV                      1054

 #define IDC_CMB_LH                      1055

 #define IDC_CMB_VH                      1056

-#define IDC_CHK_DISABLEINVISIBLE        1059

 #define IDC_CHK_RETRIEVEXSTATUS         1060

 #define IDC_TREE_EXTRAICONS             1061

 #define IDC_CHK_ENABLESMILEYS           1062

diff --git a/plugins/TipperYM/src/subst.cpp b/plugins/TipperYM/src/subst.cpp
index 34ab44cceb..9f929b59fd 100644
--- a/plugins/TipperYM/src/subst.cpp
+++ b/plugins/TipperYM/src/subst.cpp
@@ -190,17 +190,8 @@ bool CanRetrieveStatusMsg(MCONTACT hContact, char *szProto)
 	if (opt.bGetNewStatusMsg) {
 		int iFlags = CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_3, 0);
 		uint16_t wStatus = db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE);
-		if ((CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_MODEMSGSEND) && (iFlags & Proto_Status2Flag(wStatus))) {
-			iFlags = CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & (PF1_VISLIST | PF1_INVISLIST);
-			if (opt.bDisableIfInvisible && iFlags) {
-				int iVisMode = db_get_w(hContact, szProto, "ApparentMode", 0);
-				int wProtoStatus = Proto_GetStatus(szProto);
-				if ((iVisMode == ID_STATUS_OFFLINE) || (wProtoStatus == ID_STATUS_INVISIBLE && iVisMode != ID_STATUS_ONLINE))
-					return false;
-				return true;
-			}
+		if ((CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_MODEMSGSEND) && (iFlags & Proto_Status2Flag(wStatus)))
 			return true;
-		}
 	}
 
 	return false;