YAMN: obsolete settings about acting as protocol removed

5 files changed, 7 insertions, 15 deletions

diff --git a/protocols/YAMN/res/YAMN.rc b/protocols/YAMN/res/YAMN.rc
index 2cbb5edf44..52a7aa6a0f 100644
--- a/protocols/YAMN/res/YAMN.rc
+++ b/protocols/YAMN/res/YAMN.rc
@@ -214,8 +214,6 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     GROUPBOX        "YAMN General Options",IDC_STATIC,3,2,303,45
     CONTROL         "TopToolBar button ""Check mail""",IDC_CHECKTTB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,15,294,11
-    CONTROL         "Show YAMN as a Protocol (Require Restart)",IDC_YAMNASPROTO,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,30,293,9
     GROUPBOX        "MailBrowser Options",IDC_STATIC,3,48,151,68
     CONTROL         "Enable Close on Delete Button",IDC_CLOSEONDELETE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,60,143,11
     CONTROL         "Show long localized date",IDC_LONGDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,65,129,8
diff --git a/protocols/YAMN/src/main.h b/protocols/YAMN/src/main.h
index 5190b26df2..cdcf5c285c 100644
--- a/protocols/YAMN/src/main.h
+++ b/protocols/YAMN/src/main.h
@@ -18,7 +18,6 @@
 #define YAMN_DBMSGPOSSPLIT "MailMessageSplitY"
 #define YAMN_TTBFCHECK     "ForceCheckTTB"
 #define YAMN_CLOSEDELETE   "CloseOnDelete"
-#define YAMN_SHOWASPROTO   "ShowAsProtcol"
 #define YAMN_DBTIMEOPTIONS "MailBrowserTimeOpts"
 
 #define YAMN_DEFAULTHK		MAKEWORD(VK_F11,MOD_CONTROL)
diff --git a/protocols/YAMN/src/proto/pop3/pop3opt.cpp b/protocols/YAMN/src/proto/pop3/pop3opt.cpp
index 78df161e27..011d10fbdf 100644
--- a/protocols/YAMN/src/proto/pop3/pop3opt.cpp
+++ b/protocols/YAMN/src/proto/pop3/pop3opt.cpp
@@ -151,15 +151,12 @@ struct CGeneralOptDlg : public CBaseOptionsDlg
 		CheckDlgButton(m_hwnd, IDC_LONGDATE, (optDateTime & SHOWDATELONG) ? BST_CHECKED : BST_UNCHECKED);
 		CheckDlgButton(m_hwnd, IDC_SMARTDATE, (optDateTime & SHOWDATENOTODAY) ? BST_CHECKED : BST_UNCHECKED);
 		CheckDlgButton(m_hwnd, IDC_NOSECONDS, (optDateTime & SHOWDATENOSECONDS) ? BST_CHECKED : BST_UNCHECKED);
-
-		CheckDlgButton(m_hwnd, IDC_YAMNASPROTO, g_plugin.getByte(YAMN_SHOWASPROTO, 1) ? BST_CHECKED : BST_UNCHECKED);
 		CheckDlgButton(m_hwnd, IDC_CLOSEONDELETE, g_plugin.getByte(YAMN_CLOSEDELETE, 0) ? BST_CHECKED : BST_UNCHECKED);
 		return true;
 	}
 
 	bool OnApply() override
 	{
-		g_plugin.setByte(YAMN_SHOWASPROTO, IsDlgButtonChecked(m_hwnd, IDC_YAMNASPROTO));
 		g_plugin.setByte(YAMN_CLOSEDELETE, IsDlgButtonChecked(m_hwnd, IDC_CLOSEONDELETE));
 		g_plugin.setByte(YAMN_TTBFCHECK, IsDlgButtonChecked(m_hwnd, IDC_CHECKTTB));
 
diff --git a/protocols/YAMN/src/resource.h b/protocols/YAMN/src/resource.h
index 419437b171..2f20c00151 100644
--- a/protocols/YAMN/src/resource.h
+++ b/protocols/YAMN/src/resource.h
@@ -97,7 +97,6 @@
 #define IDC_LONGDATE                    1128
 #define IDC_SMARTDATE                   1129
 #define IDC_NOSECONDS                   1130
-#define IDC_YAMNASPROTO                 1131
 #define IDC_CHECKAPOP                   1200
 #define IDC_STATUSGROUP                 1338
 #define IDC_SPLITTER                    1400
diff --git a/protocols/YAMN/src/services.cpp b/protocols/YAMN/src/services.cpp
index 02b95590db..682842bdaa 100644
--- a/protocols/YAMN/src/services.cpp
+++ b/protocols/YAMN/src/services.cpp
@@ -2,19 +2,18 @@
 
 static INT_PTR Service_GetCaps(WPARAM wParam, LPARAM)
 {
-	if (wParam == PFLAGNUM_4)
+	switch(wParam) {
+	case PFLAGNUM_4:
 		return PF4_NOCUSTOMAUTH;
-	if (wParam == PFLAG_UNIQUEIDTEXT)
+	case PFLAG_UNIQUEIDTEXT:
 		return (INT_PTR)TranslateT("Nick");
-	if (wParam == PFLAG_MAXLENOFMESSAGE)
+	case PFLAG_MAXLENOFMESSAGE:
 		return 400;
-	if (wParam == PFLAGNUM_2)
-		return PF2_ONLINE | PF2_SHORTAWAY | PF2_LONGAWAY | PF2_LIGHTDND;
-	if (wParam == PFLAGNUM_5) {
-		if (g_plugin.getByte(YAMN_SHOWASPROTO, 1))
-			return PF2_SHORTAWAY | PF2_LONGAWAY | PF2_LIGHTDND;
+	case PFLAGNUM_2:
+	case PFLAGNUM_5:
 		return PF2_ONLINE | PF2_SHORTAWAY | PF2_LONGAWAY | PF2_LIGHTDND;
 	}
+	
 	return 0;
 }