fixes #1963 (Remove Free for Chat, On the Phone and Out to Lunch statuses completely)

3 files changed, 2 insertions, 51 deletions

diff --git a/plugins/StatusChange/src/main.cpp b/plugins/StatusChange/src/main.cpp
index 16b81f6d24..723cb289c3 100644
--- a/plugins/StatusChange/src/main.cpp
+++ b/plugins/StatusChange/src/main.cpp
@@ -42,10 +42,7 @@ void LoadOptions()
 	Options.IfNA = (BOOL)g_plugin.getByte("IfNA", TRUE);

 	Options.IfOccupied = (BOOL)g_plugin.getByte("IfOccupied", FALSE);

 	Options.IfDND = (BOOL)g_plugin.getByte("IfDND", FALSE);

-	Options.IfFreeforchat = (BOOL)g_plugin.getByte("IfFreeforchat", FALSE);

 	Options.IfInvisible = (BOOL)g_plugin.getByte("IfInvisible", FALSE);

-	Options.IfOnthephone = (BOOL)g_plugin.getByte("IfOnthephone", FALSE);

-	Options.IfOuttolunch = (BOOL)g_plugin.getByte("IfOuttolunch", FALSE);

 }

 

 static int StatusChangeGetMessage(WPARAM, LPARAM hDbEvent)

@@ -69,10 +66,7 @@ static int StatusChangeGetMessage(WPARAM, LPARAM hDbEvent)
 	case ID_STATUS_NA: change_status = Options.IfNA; break;

 	case ID_STATUS_OCCUPIED: change_status = Options.IfOccupied; break;

 	case ID_STATUS_DND: change_status = Options.IfDND; break;

-	case ID_STATUS_FREECHAT: change_status = Options.IfFreeforchat; break;

 	case ID_STATUS_INVISIBLE: change_status = Options.IfInvisible; break;

-	case ID_STATUS_ONTHEPHONE: change_status = Options.IfOnthephone; break;

-	case ID_STATUS_OUTTOLUNCH: change_status = Options.IfOuttolunch; break;

 	default: change_status = FALSE; break;

 	}

 

@@ -133,11 +127,7 @@ static INT_PTR CALLBACK DlgProcStatusChangeOpts(HWND hwndDlg, UINT msg, WPARAM w
 		case ID_STATUS_DND: CheckDlgButton(hwndDlg, IDC_RAD_DND, BST_CHECKED); break;

 		case ID_STATUS_NA: CheckDlgButton(hwndDlg, IDC_RAD_NA, BST_CHECKED); break;

 		case ID_STATUS_OCCUPIED: CheckDlgButton(hwndDlg, IDC_RAD_OCCUPIED, BST_CHECKED); break;

-		case ID_STATUS_FREECHAT: CheckDlgButton(hwndDlg, IDC_RAD_FREECHAT, BST_CHECKED); break;

 		case ID_STATUS_INVISIBLE: CheckDlgButton(hwndDlg, IDC_RAD_INVISIBLE, BST_CHECKED); break;

-		case ID_STATUS_ONTHEPHONE: CheckDlgButton(hwndDlg, IDC_RAD_ONTHEPHONE, BST_CHECKED); break;

-		case ID_STATUS_OUTTOLUNCH: CheckDlgButton(hwndDlg, IDC_RAD_OUTTOLUNCH, BST_CHECKED); break;

-			break;

 		}

 

 		CheckDlgButton(hwndDlg, IDC_CHK_OFFLINE, Options.IfOffline ? BST_CHECKED : BST_UNCHECKED);

@@ -146,10 +136,7 @@ static INT_PTR CALLBACK DlgProcStatusChangeOpts(HWND hwndDlg, UINT msg, WPARAM w
 		CheckDlgButton(hwndDlg, IDC_CHK_DND, Options.IfDND ? BST_CHECKED : BST_UNCHECKED);

 		CheckDlgButton(hwndDlg, IDC_CHK_NA, Options.IfNA ? BST_CHECKED : BST_UNCHECKED);

 		CheckDlgButton(hwndDlg, IDC_CHK_OCCUPIED, Options.IfOccupied ? BST_CHECKED : BST_UNCHECKED);

-		CheckDlgButton(hwndDlg, IDC_CHK_FREECHAT, Options.IfFreeforchat ? BST_CHECKED : BST_UNCHECKED);

 		CheckDlgButton(hwndDlg, IDC_CHK_INVISIBLE, Options.IfInvisible ? BST_CHECKED : BST_UNCHECKED);

-		CheckDlgButton(hwndDlg, IDC_CHK_ONTHEPHONE, Options.IfOnthephone ? BST_CHECKED : BST_UNCHECKED);

-		CheckDlgButton(hwndDlg, IDC_CHK_OUTTOLUNCH, Options.IfOuttolunch ? BST_CHECKED : BST_UNCHECKED);

 		return TRUE;

 

 	case WM_COMMAND:

@@ -195,22 +182,10 @@ static INT_PTR CALLBACK DlgProcStatusChangeOpts(HWND hwndDlg, UINT msg, WPARAM w
 			Options.ChangeTo = ID_STATUS_OCCUPIED;

 			PostMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

 			break;

-		case IDC_RAD_FREECHAT:

-			Options.ChangeTo = ID_STATUS_FREECHAT;

-			PostMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

-			break;

 		case IDC_RAD_INVISIBLE:

 			Options.ChangeTo = ID_STATUS_INVISIBLE;

 			PostMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

 			break;

-		case IDC_RAD_ONTHEPHONE:

-			Options.ChangeTo = ID_STATUS_ONTHEPHONE;

-			PostMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

-			break;

-		case IDC_RAD_OUTTOLUNCH:

-			Options.ChangeTo = ID_STATUS_OUTTOLUNCH;

-			PostMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

-			break;

 

 		case IDC_CHK_OFFLINE:

 			Options.IfOffline = !Options.IfOffline;

@@ -236,22 +211,10 @@ static INT_PTR CALLBACK DlgProcStatusChangeOpts(HWND hwndDlg, UINT msg, WPARAM w
 			Options.IfOccupied = !Options.IfOccupied;

 			PostMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

 			break;

-		case IDC_CHK_FREECHAT:

-			Options.IfFreeforchat = !Options.IfFreeforchat;

-			PostMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

-			break;

 		case IDC_CHK_INVISIBLE:

 			Options.IfInvisible = !Options.IfInvisible;

 			PostMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

 			break;

-		case IDC_CHK_ONTHEPHONE:

-			Options.IfOnthephone = !Options.IfOnthephone;

-			PostMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

-			break;

-		case IDC_CHK_OUTTOLUNCH:

-			Options.IfOuttolunch = !Options.IfOuttolunch;

-			PostMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

-			break;

 		}

 		break;

 

@@ -275,10 +238,7 @@ static INT_PTR CALLBACK DlgProcStatusChangeOpts(HWND hwndDlg, UINT msg, WPARAM w
 				g_plugin.setByte("IfNA", (BYTE)Options.IfNA);

 				g_plugin.setByte("IfDND", (BYTE)Options.IfDND);

 				g_plugin.setByte("IfOccupied", (BYTE)Options.IfOccupied);

-				g_plugin.setByte("IfFreeforchat", (BYTE)Options.IfFreeforchat);

 				g_plugin.setByte("IfInvisible", (BYTE)Options.IfInvisible);

-				g_plugin.setByte("IfOnthephone", (BYTE)Options.IfOnthephone);

-				g_plugin.setByte("IfOuttolunch", (BYTE)Options.IfOuttolunch);

 				return TRUE;

 			}

 			break;

diff --git a/plugins/StatusChange/src/resource.h b/plugins/StatusChange/src/resource.h
index 668f5c35fc..1b0a7294da 100644
--- a/plugins/StatusChange/src/resource.h
+++ b/plugins/StatusChange/src/resource.h
@@ -9,20 +9,14 @@
 #define IDC_CHK_DND                     1004

 #define IDC_CHK_NA                      1005

 #define IDC_CHK_OCCUPIED                1006

-#define IDC_CHK_FREECHAT                1007

-#define IDC_CHK_INVISIBLE               1008

-#define IDC_CHK_ONTHEPHONE              1009

-#define IDC_CHK_OUTTOLUNCH              1010

+#define IDC_CHK_INVISIBLE               1007

 #define IDC_RAD_OFFLINE                 2001

 #define IDC_RAD_ONLINE                  2002

 #define IDC_RAD_AWAY                    2003

 #define IDC_RAD_DND                     2004

 #define IDC_RAD_NA                      2005

 #define IDC_RAD_OCCUPIED                2006

-#define IDC_RAD_FREECHAT                2007

-#define IDC_RAD_INVISIBLE               2008

-#define IDC_RAD_ONTHEPHONE              2009

-#define IDC_RAD_OUTTOLUNCH              2010

+#define IDC_RAD_INVISIBLE               2007

 #define IDC_CHK_MESSAGEREAD             3001

 #define IDC_CHK_MESSAGESEND             3002

 #define IDC_CHK_FILEREAD                3005

diff --git a/plugins/StatusChange/src/stdafx.h b/plugins/StatusChange/src/stdafx.h
index 7d6e3b3146..5424e7de8d 100644
--- a/plugins/StatusChange/src/stdafx.h
+++ b/plugins/StatusChange/src/stdafx.h
@@ -38,8 +38,5 @@ struct TOPTIONS
 	BOOL IfNA;

 	BOOL IfOccupied;

 	BOOL IfDND;

-	BOOL IfFreeforchat;

 	BOOL IfInvisible;

-	BOOL IfOnthephone;

-	BOOL IfOuttolunch;

 };