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

16 files changed, 44 insertions, 114 deletions

diff --git a/plugins/BASS_interface/res/Bass.rc b/plugins/BASS_interface/res/Bass.rc
index 360be28970..d703bc910e 100644
--- a/plugins/BASS_interface/res/Bass.rc
+++ b/plugins/BASS_interface/res/Bass.rc
@@ -63,10 +63,7 @@ BEGIN
 	AUTOCHECKBOX    "Not available", IDC_CHECKBOX4, 240, 50, 65, 8

 	AUTOCHECKBOX    "Occupied", IDC_CHECKBOX5, 240, 60, 65, 8

 	AUTOCHECKBOX    "Do not disturb", IDC_CHECKBOX6, 240, 70, 65, 8

-	AUTOCHECKBOX    "Free for chat", IDC_CHECKBOX7, 240, 80, 65, 8

-	AUTOCHECKBOX    "Invisible", IDC_CHECKBOX8, 240, 90, 65, 8

-	AUTOCHECKBOX    "On the phone", IDC_CHECKBOX9, 240, 100, 65, 8

-	AUTOCHECKBOX    "Out to lunch", IDC_CHECKBOX10, 240, 110, 65, 8

+	AUTOCHECKBOX    "Invisible", IDC_CHECKBOX7, 240, 80, 65, 8

 	AUTOCHECKBOX    "Preview", IDC_PREVIEW, 200, 165, 90, 8, BS_RIGHT, WS_EX_RIGHT

 END

 

diff --git a/plugins/BASS_interface/src/Main.cpp b/plugins/BASS_interface/src/Main.cpp
index 0435ef045c..b402c4c583 100644
--- a/plugins/BASS_interface/src/Main.cpp
+++ b/plugins/BASS_interface/src/Main.cpp
@@ -159,7 +159,7 @@ INT_PTR CALLBACK OptionsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 

 		CheckDlgButton(hwndDlg, IDC_PREVIEW, EnPreview ? BST_CHECKED : BST_UNCHECKED);

 

-		for (int i = IDC_CHECKBOX1; i < IDC_CHECKBOX10 + 1; i++)

+		for (int i = IDC_CHECKBOX1; i <= IDC_CHECKBOX7; i++)

 			if (StatMask & (1 << (i - IDC_CHECKBOX1)))

 				CheckDlgButton(hwndDlg, i, BST_CHECKED);

 

@@ -176,7 +176,7 @@ INT_PTR CALLBACK OptionsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 			EnableWindow(GetDlgItem(hwndDlg, IDC_QUIETTIME), FALSE);

 			EnableWindow(GetDlgItem(hwndDlg, IDC_PREVIEW), FALSE);

 

-			for (int i = IDC_CHECKBOX1; i < IDC_CHECKBOX10 + 1; i++)

+			for (int i = IDC_CHECKBOX1; i <= IDC_CHECKBOX7; i++)

 				EnableWindow(GetDlgItem(hwndDlg, i), FALSE);

 		}

 		else {

@@ -243,7 +243,7 @@ INT_PTR CALLBACK OptionsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 				g_plugin.setByte(OPT_PREVIEW, EnPreview);

 

 				StatMask = 0;

-				for (int i = IDC_CHECKBOX10; i > IDC_CHECKBOX1 - 1; i--) {

+				for (int i = IDC_CHECKBOX7; i >= IDC_CHECKBOX1; i--) {

 					StatMask <<= 1;

 					if (IsDlgButtonChecked(hwndDlg, i) == BST_CHECKED)

 						StatMask |= 1;

@@ -287,9 +287,6 @@ INT_PTR CALLBACK OptionsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 		case IDC_CHECKBOX5:

 		case IDC_CHECKBOX6:

 		case IDC_CHECKBOX7:

-		case IDC_CHECKBOX8:

-		case IDC_CHECKBOX9:

-		case IDC_CHECKBOX10:

 		case IDC_PREVIEW:

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

 			break;

diff --git a/plugins/BASS_interface/src/Resource.h b/plugins/BASS_interface/src/Resource.h
index 9af71389a2..fd38b008df 100644
--- a/plugins/BASS_interface/src/Resource.h
+++ b/plugins/BASS_interface/src/Resource.h
@@ -19,9 +19,6 @@
 #define IDC_CHECKBOX5                           1104

 #define IDC_CHECKBOX6                           1105

 #define IDC_CHECKBOX7                           1106

-#define IDC_CHECKBOX8                           1107

-#define IDC_CHECKBOX9                           1108

-#define IDC_CHECKBOX10                          1109

 #define IDC_PREVIEW                             1110

 #define IDI_BASSSoundOn							1111

 #define IDI_BASSSoundOff						1112

diff --git a/plugins/BuddyPounce/res/resource.rc b/plugins/BuddyPounce/res/resource.rc
index b1c6310750..444811a285 100644
--- a/plugins/BuddyPounce/res/resource.rc
+++ b/plugins/BuddyPounce/res/resource.rc
@@ -88,9 +88,6 @@ BEGIN
     CONTROL         "Check1",IDC_CHECK5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,66,74,10

     CONTROL         "Check1",IDC_CHECK6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,93,17,81,10

     CONTROL         "Check1",IDC_CHECK7,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,93,30,81,10

-    CONTROL         "Check1",IDC_CHECK8,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,93,42,81,10

-    CONTROL         "Check1",IDC_CHECK9,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,93,54,81,10

-    CONTROL         "Check1",IDC_CHECK10,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,93,66,81,10

 END

 

 IDD_OPTIONS DIALOGEX 0, 0, 314, 249

diff --git a/plugins/BuddyPounce/src/dialog.cpp b/plugins/BuddyPounce/src/dialog.cpp
index 9421b8e51d..db306951f4 100644
--- a/plugins/BuddyPounce/src/dialog.cpp
+++ b/plugins/BuddyPounce/src/dialog.cpp
@@ -97,10 +97,7 @@ INT_PTR CALLBACK StatusModesDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l
 				| (IsDlgButtonChecked(hwnd, IDC_CHECK4) << 3)

 				| (IsDlgButtonChecked(hwnd, IDC_CHECK5) << 4)

 				| (IsDlgButtonChecked(hwnd, IDC_CHECK6) << 5)

-				| (IsDlgButtonChecked(hwnd, IDC_CHECK7) << 6)

-				| (IsDlgButtonChecked(hwnd, IDC_CHECK8) << 7)

-				| (IsDlgButtonChecked(hwnd, IDC_CHECK9) << 8)

-				| (IsDlgButtonChecked(hwnd, IDC_CHECK10) << 9);

+				| (IsDlgButtonChecked(hwnd, IDC_CHECK7) << 6);

 

 			if (!mir_wstrcmp(type, L"Any")) {

 				if (LOWORD(wParam) == IDOK)

@@ -138,10 +135,7 @@ void statusModes(windowInfo *wi, int myStatusMode) // myStatusMode=1 sendIfMySta
 			SetDlgItemText(hwnd, IDC_CHECK4, TranslateT("Not available"));

 			SetDlgItemText(hwnd, IDC_CHECK5, TranslateT("Occupied"));

 			SetDlgItemText(hwnd, IDC_CHECK6, TranslateT("Do not disturb"));

-			SetDlgItemText(hwnd, IDC_CHECK7, TranslateT("Free for chat"));

-			SetDlgItemText(hwnd, IDC_CHECK8, TranslateT("Invisible"));

-			SetDlgItemText(hwnd, IDC_CHECK9, TranslateT("On the phone"));

-			SetDlgItemText(hwnd, IDC_CHECK10, TranslateT("Out to lunch"));

+			SetDlgItemText(hwnd, IDC_CHECK7, TranslateT("Invisible"));

 		}

 	}

 	else {

@@ -159,10 +153,7 @@ void statusModes(windowInfo *wi, int myStatusMode) // myStatusMode=1 sendIfMySta
 			SetDlgItemText(hwnd, IDC_CHECK4, TranslateT("To Not available"));

 			SetDlgItemText(hwnd, IDC_CHECK5, TranslateT("To Occupied"));

 			SetDlgItemText(hwnd, IDC_CHECK6, TranslateT("To Do not disturb"));

-			SetDlgItemText(hwnd, IDC_CHECK7, TranslateT("To Free for chat"));

-			SetDlgItemText(hwnd, IDC_CHECK8, TranslateT("To Invisible"));

-			SetDlgItemText(hwnd, IDC_CHECK9, TranslateT("To On the phone"));

-			SetDlgItemText(hwnd, IDC_CHECK10, TranslateT("To Out to lunch"));

+			SetDlgItemText(hwnd, IDC_CHECK7, TranslateT("To Invisible"));

 		}

 	}

 	CheckDlgButton(hwnd, IDC_CHECK1, (statusFlag & ANY) ? BST_CHECKED : BST_UNCHECKED);

@@ -171,7 +162,7 @@ void statusModes(windowInfo *wi, int myStatusMode) // myStatusMode=1 sendIfMySta
 	CheckDlgButton(hwnd, IDC_CHECK4, (statusFlag & NA) >> 3 ? BST_CHECKED : BST_UNCHECKED);

 	CheckDlgButton(hwnd, IDC_CHECK5, (statusFlag & OCCUPIED) >> 4 ? BST_CHECKED : BST_UNCHECKED);

 	CheckDlgButton(hwnd, IDC_CHECK6, (statusFlag & DND) >> 5 ? BST_CHECKED : BST_UNCHECKED);

-	CheckDlgButton(hwnd, IDC_CHECK8, (statusFlag & INVISIBLE) >> 7 ? BST_CHECKED : BST_UNCHECKED);

+	CheckDlgButton(hwnd, IDC_CHECK7, (statusFlag & INVISIBLE) >> 6 ? BST_CHECKED : BST_UNCHECKED);

 }

 

 void deletePounce(MCONTACT hContact)

diff --git a/plugins/BuddyPounce/src/resource.h b/plugins/BuddyPounce/src/resource.h
index 08ddca83fb..1f826f13f2 100644
--- a/plugins/BuddyPounce/src/resource.h
+++ b/plugins/BuddyPounce/src/resource.h
@@ -62,9 +62,6 @@
 #define IDC_CHECK5                      1085

 #define IDC_CHECK6                      1086

 #define IDC_CHECK7                      1087

-#define IDC_CHECK8                      1088

-#define IDC_CHECK9                      1089

-#define IDC_CHECK10                     1090

 #define IDC_SETTINGMSG2                 1095

 #define IDC_USEADVANCED                 1096

 #define IDC_SHOWDELIVERYMSGS            1097

diff --git a/plugins/Clist_modern/src/modern_clc.h b/plugins/Clist_modern/src/modern_clc.h
index b40cb9c8f3..967d6b17aa 100644
--- a/plugins/Clist_modern/src/modern_clc.h
+++ b/plugins/Clist_modern/src/modern_clc.h
@@ -68,31 +68,28 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 void clcSetDelayTimer(UINT_PTR uIDEvent, HWND hwnd, int nDelay = -1);

 

-#define FONTID_CONTACTS    0

-#define FONTID_INVIS       1

-#define FONTID_OFFLINE     2

-#define FONTID_NOTONLIST   3

-#define FONTID_OPENGROUPS      4

-#define FONTID_OPENGROUPCOUNTS 5

-#define FONTID_DIVIDERS    6

-#define FONTID_OFFINVIS    7

-#define FONTID_SECONDLINE  8

-#define FONTID_THIRDLINE   9

-#define FONTID_AWAY			10

-#define FONTID_DND			11

-#define FONTID_NA			12

-#define FONTID_OCCUPIED		13

-#define FONTID_CHAT			14

-#define FONTID_INVISIBLE	15

-#define FONTID_PHONE		16

-#define FONTID_LUNCH		17

-#define FONTID_CONTACT_TIME	18

-#define FONTID_CLOSEDGROUPS 19

-#define FONTID_CLOSEDGROUPCOUNTS 20

+#define FONTID_CONTACTS             0

+#define FONTID_INVIS                1

+#define FONTID_OFFLINE              2

+#define FONTID_NOTONLIST            3

+#define FONTID_OPENGROUPS           4

+#define FONTID_OPENGROUPCOUNTS      5

+#define FONTID_DIVIDERS             6

+#define FONTID_OFFINVIS             7

+#define FONTID_SECONDLINE           8

+#define FONTID_THIRDLINE            9

+#define FONTID_AWAY                10

+#define FONTID_DND                 11

+#define FONTID_NA                  12

+#define FONTID_OCCUPIED            13

+#define FONTID_INVISIBLE           15

+#define FONTID_CONTACT_TIME        18

+#define FONTID_CLOSEDGROUPS        19

+#define FONTID_CLOSEDGROUPCOUNTS   20

 #define FONTID_STATUSBAR_PROTONAME 21

-#define FONTID_EVENTAREA	22

-#define FONTID_VIEMODES		23

-#define FONTID_MODERN_MAX 23

+#define FONTID_EVENTAREA           22

+#define FONTID_VIEMODES            23

+#define FONTID_MODERN_MAX          23

 

 #define DROPTARGET_ONMETACONTACT  6

 #define DROPTARGET_ONSUBCONTACT  7

diff --git a/plugins/Clist_modern/src/modern_clcmsgs.cpp b/plugins/Clist_modern/src/modern_clcmsgs.cpp
index 3f6da485a2..79aaedf31f 100644
--- a/plugins/Clist_modern/src/modern_clcmsgs.cpp
+++ b/plugins/Clist_modern/src/modern_clcmsgs.cpp
@@ -87,10 +87,7 @@ LRESULT cli_ProcessExternalMessages(HWND hwnd, ClcData *dat, UINT msg, WPARAM wP
 			dat->fontModernInfo[FONTID_DND].colour = lParam;

 			dat->fontModernInfo[FONTID_NA].colour = lParam;

 			dat->fontModernInfo[FONTID_OCCUPIED].colour = lParam;

-			dat->fontModernInfo[FONTID_CHAT].colour = lParam;

 			dat->fontModernInfo[FONTID_INVISIBLE].colour = lParam;

-			dat->fontModernInfo[FONTID_PHONE].colour = lParam;

-			dat->fontModernInfo[FONTID_LUNCH].colour = lParam;

 			dat->fontModernInfo[FONTID_CONTACT_TIME].colour = lParam;

 			break;

 		case FONTID_OPENGROUPS:

diff --git a/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp
index 07bb701d71..790ae94055 100644
--- a/plugins/Clist_modern/src/modern_clcopts.cpp
+++ b/plugins/Clist_modern/src/modern_clcopts.cpp
@@ -74,10 +74,7 @@ static fontOptionsList[] =
 	{ FIDF_CLASSGENERAL, FONTID_DND, CLCGROUP, LPGENW("Do not disturb contacts"), DEFAULT_COLOUR, DEFAULT_FAMILY, DEFAULT_CHARSET, FONTF_NORMAL, DEFAULT_SIZE, DEFAULT_EFFECT },

 	{ FIDF_CLASSGENERAL, FONTID_NA, CLCGROUP, LPGENW("Not available contacts"), DEFAULT_COLOUR, DEFAULT_FAMILY, DEFAULT_CHARSET, FONTF_NORMAL, DEFAULT_SIZE, DEFAULT_EFFECT },

 	{ FIDF_CLASSGENERAL, FONTID_OCCUPIED, CLCGROUP, LPGENW("Occupied contacts"), DEFAULT_COLOUR, DEFAULT_FAMILY, DEFAULT_CHARSET, FONTF_NORMAL, DEFAULT_SIZE, DEFAULT_EFFECT },

-	{ FIDF_CLASSGENERAL, FONTID_CHAT, CLCGROUP, LPGENW("Free for chat contacts"), DEFAULT_COLOUR, DEFAULT_FAMILY, DEFAULT_CHARSET, FONTF_NORMAL, DEFAULT_SIZE, DEFAULT_EFFECT },

 	{ FIDF_CLASSGENERAL, FONTID_INVISIBLE, CLCGROUP, LPGENW("Invisible contacts"), DEFAULT_COLOUR, DEFAULT_FAMILY, DEFAULT_CHARSET, FONTF_NORMAL, DEFAULT_SIZE, DEFAULT_EFFECT },

-	{ FIDF_CLASSGENERAL, FONTID_PHONE, CLCGROUP, LPGENW("On the phone contacts"), DEFAULT_COLOUR, DEFAULT_FAMILY, DEFAULT_CHARSET, FONTF_NORMAL, DEFAULT_SIZE, DEFAULT_EFFECT },

-	{ FIDF_CLASSGENERAL, FONTID_LUNCH, CLCGROUP, LPGENW("Out to lunch contacts"), DEFAULT_COLOUR, DEFAULT_FAMILY, DEFAULT_CHARSET, FONTF_NORMAL, DEFAULT_SIZE, DEFAULT_EFFECT },

 	{ FIDF_CLASSGENERAL, FONTID_OFFLINE, CLCGROUP, LPGENW("Offline contacts"), DEFAULT_GREYCOLOUR, DEFAULT_FAMILY, DEFAULT_CHARSET, FONTF_NORMAL, DEFAULT_SIZE, DEFAULT_EFFECT },

 	{ FIDF_CLASSGENERAL, FONTID_INVIS, CLCGROUP, LPGENW("Online contacts to whom you have a different visibility"), DEFAULT_COLOUR, DEFAULT_FAMILY, DEFAULT_CHARSET, FONTF_NORMAL, DEFAULT_SIZE, DEFAULT_EFFECT },

 	{ FIDF_CLASSGENERAL, FONTID_OFFINVIS, CLCGROUP, LPGENW("Offline contacts to whom you have a different visibility"), DEFAULT_COLOUR, DEFAULT_FAMILY, DEFAULT_CHARSET, FONTF_NORMAL, DEFAULT_SIZE, DEFAULT_EFFECT },

diff --git a/plugins/Clist_modern/src/modern_rowheight_funcs.cpp b/plugins/Clist_modern/src/modern_rowheight_funcs.cpp
index 8adc019b4e..f9e3497a45 100644
--- a/plugins/Clist_modern/src/modern_rowheight_funcs.cpp
+++ b/plugins/Clist_modern/src/modern_rowheight_funcs.cpp
@@ -324,8 +324,7 @@ BOOL RowHeights_Alloc(ClcData *dat, int size)
 

 static int contact_fonts[] = {

 	FONTID_CONTACTS, FONTID_INVIS, FONTID_OFFLINE, FONTID_NOTONLIST, FONTID_OFFINVIS,

-	FONTID_AWAY, FONTID_DND, FONTID_NA, FONTID_OCCUPIED, FONTID_CHAT, FONTID_INVISIBLE,

-	FONTID_PHONE, FONTID_LUNCH };

+	FONTID_AWAY, FONTID_DND, FONTID_NA, FONTID_OCCUPIED, FONTID_INVISIBLE };

 

 static int other_fonts[] = { FONTID_OPENGROUPS, FONTID_OPENGROUPCOUNTS, FONTID_CLOSEDGROUPS, FONTID_CLOSEDGROUPCOUNTS, FONTID_DIVIDERS, FONTID_CONTACT_TIME };

 

diff --git a/plugins/NewXstatusNotify/res/resource.rc b/plugins/NewXstatusNotify/res/resource.rc
index 5012458ee7..2055800986 100644
--- a/plugins/NewXstatusNotify/res/resource.rc
+++ b/plugins/NewXstatusNotify/res/resource.rc
@@ -124,18 +124,9 @@ BEGIN
     LTEXT           "Do not disturb",IDC_STATIC,10,103,56,8

     CONTROL         "",IDC_DND_BG,"ColourPicker",WS_TABSTOP,73,101,24,12

     CONTROL         "",IDC_DND_TX,"ColourPicker",WS_TABSTOP,106,101,24,12

-    LTEXT           "Free for chat",IDC_STATIC,10,118,56,8

-    CONTROL         "",IDC_FREEFORCHAT_BG,"ColourPicker",WS_TABSTOP,73,116,24,12

-    CONTROL         "",IDC_FREEFORCHAT_TX,"ColourPicker",WS_TABSTOP,106,116,24,12

-    LTEXT           "Out to lunch",IDC_STATIC,10,148,56,8

-    CONTROL         "",IDC_INVISIBLE_BG,"ColourPicker",WS_TABSTOP,73,131,24,12

-    CONTROL         "",IDC_INVISIBLE_TX,"ColourPicker",WS_TABSTOP,106,131,24,12

-    LTEXT           "Invisible",IDC_STATIC,10,133,56,8

-    CONTROL         "",IDC_OUTTOLUNCH_BG,"ColourPicker",WS_TABSTOP,73,146,24,12

-    CONTROL         "",IDC_OUTTOLUNCH_TX,"ColourPicker",WS_TABSTOP,106,146,24,12

-    LTEXT           "On the phone",IDC_STATIC,10,163,56,8

-    CONTROL         "",IDC_ONTHEPHONE_BG,"ColourPicker",WS_TABSTOP,73,161,24,12

-    CONTROL         "",IDC_ONTHEPHONE_TX,"ColourPicker",WS_TABSTOP,106,161,24,12

+    LTEXT           "Invisible",IDC_STATIC,10,118,56,8

+    CONTROL         "",IDC_INVISIBLE_BG,"ColourPicker",WS_TABSTOP,73,116,24,12

+    CONTROL         "",IDC_INVISIBLE_TX,"ColourPicker",WS_TABSTOP,106,116,24,12

     LTEXT           "Extra status",IDC_STATIC,10,178,56,8

     CONTROL         "",IDC_XSTATUS_TX,"ColourPicker",WS_TABSTOP,106,176,24,12

     CONTROL         "",IDC_XSTATUS_BG,"ColourPicker",WS_TABSTOP,73,176,24,12

@@ -215,25 +206,19 @@ BEGIN
     LTEXT           "Disable when my status is:",IDC_STATIC,15,37,116,8

     CONTROL         "Online",IDC_CHK_ONLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,49,116,10

     CONTROL         "Invisible",IDC_CHK_INVISIBLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,59,116,10

-    CONTROL         "Free for chat",IDC_CHK_FREECHAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,69,116,10

-    CONTROL         "Away",IDC_CHK_AWAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,79,116,10

-    CONTROL         "Not available",IDC_CHK_NA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,89,116,10

-    CONTROL         "Occupied",IDC_CHK_OCCUPIED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,99,116,10

-    CONTROL         "Do not disturb",IDC_CHK_DND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,109,116,10

-    CONTROL         "Out to lunch",IDC_CHK_OUTTOLUNCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,129,116,10

-    CONTROL         "On the phone",IDC_CHK_ONTHEPHONE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,119,116,10

+    CONTROL         "Away",IDC_CHK_AWAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,69,116,10

+    CONTROL         "Not available",IDC_CHK_NA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,79,116,10

+    CONTROL         "Occupied",IDC_CHK_OCCUPIED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,89,116,10

+    CONTROL         "Do not disturb",IDC_CHK_DND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,99,116,10

     GROUPBOX        "Sounds",IDC_STATIC,147,8,132,136

     CONTROL         "Disable globally",IDC_CHK_SGLOBAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,20,116,10

     LTEXT           "Disable when my status is:",IDC_STATIC,157,36,116,8

     CONTROL         "Online",IDC_CHK_ONLINE2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,50,116,10

     CONTROL         "Invisible",IDC_CHK_INVISIBLE2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,60,116,10

-    CONTROL         "Free for chat",IDC_CHK_FREECHAT2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,70,116,10

     CONTROL         "Away",IDC_CHK_AWAY2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,80,116,10

     CONTROL         "Not available",IDC_CHK_NA2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,90,116,10

     CONTROL         "Occupied",IDC_CHK_OCCUPIED2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,100,116,10

     CONTROL         "Do not disturb",IDC_CHK_DND2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,110,116,10

-    CONTROL         "Out to lunch",IDC_CHK_OUTTOLUNCH2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,130,116,10

-    CONTROL         "On the phone",IDC_CHK_ONTHEPHONE2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,120,116,10

     CONTROL         "Disable only if I change global status",IDC_CHK_ONLYGLOBAL,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,151,258,10

     PUSHBUTTON      "OK",IDC_OK,90,169,50,14

diff --git a/plugins/NewXstatusNotify/src/resource.h b/plugins/NewXstatusNotify/src/resource.h
index 3b10ffedce..3b1f78becf 100644
--- a/plugins/NewXstatusNotify/src/resource.h
+++ b/plugins/NewXstatusNotify/src/resource.h
@@ -146,10 +146,7 @@
 #define IDC_CHK_DND                     40074

 #define IDC_CHK_NA                      40075

 #define IDC_CHK_OCCUPIED                40076

-#define IDC_CHK_FREECHAT                40077

-#define IDC_CHK_INVISIBLE               40078

-#define IDC_CHK_ONTHEPHONE              40079

-#define IDC_CHK_OUTTOLUNCH              40080

+#define IDC_CHK_INVISIBLE               40077

 #define IDC_CHK_XSTATUS                 40081

 #define IDC_CHK_STATUS_MESSAGE          40082

 #define IDC_CHK_FROMOFFLINE             40083

@@ -176,16 +173,10 @@
 #define IDC_CHK_NA2                     42075

 #define IDC_OCCUPIED_BG                 42076

 #define IDC_CHK_OCCUPIED2               42076

-#define IDC_FREEFORCHAT_BG              42077

-#define IDC_CHK_FREECHAT2               42077

-#define IDC_INVISIBLE_BG                42078

-#define IDC_CHK_INVISIBLE2              42078

-#define IDC_ONTHEPHONE_BG               42079

-#define IDC_CHK_ONTHEPHONE2             42079

-#define IDC_OUTTOLUNCH_BG               42080

-#define IDC_CHK_OUTTOLUNCH2             42080

-#define IDC_XSTATUS_BG                  42081

-#define IDC_STATUSMSG_BG                42082

+#define IDC_INVISIBLE_BG                42077

+#define IDC_CHK_INVISIBLE2              42077

+#define IDC_XSTATUS_BG                  42078

+#define IDC_STATUSMSG_BG                42079

 

 // Next default values for new objects

 // 

diff --git a/plugins/Nudge/res/resource.rc b/plugins/Nudge/res/resource.rc
index 6cda0a870b..94c3fbc250 100644
--- a/plugins/Nudge/res/resource.rc
+++ b/plugins/Nudge/res/resource.rc
@@ -91,10 +91,7 @@ BEGIN
     CONTROL         "Not available",IDC_CHECKST3,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,18,177,58,9

     CONTROL         "Occupied",IDC_CHECKST4,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,18,187,58,9

     CONTROL         "Do not disturb",IDC_CHECKST5,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,84,147,72,9

-    CONTROL         "Free for chat",IDC_CHECKST6,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,84,157,72,9

-    CONTROL         "Invisible",IDC_CHECKST7,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,84,167,72,9

-    CONTROL         "On the phone",IDC_CHECKST8,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,84,177,72,9

-    CONTROL         "Out to lunch",IDC_CHECKST9,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,84,187,72,9

+    CONTROL         "Invisible",IDC_CHECKST6,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,84,157,72,9

 END

 

 IDD_OPT_SHAKE DIALOGEX 0, 0, 309, 184

diff --git a/plugins/Nudge/src/options.cpp b/plugins/Nudge/src/options.cpp
index 97b1925047..4c88ba1d50 100644
--- a/plugins/Nudge/src/options.cpp
+++ b/plugins/Nudge/src/options.cpp
@@ -266,9 +266,6 @@ static INT_PTR CALLBACK DlgProcNudgeOpt(HWND hwnd, UINT msg, WPARAM wParam, LPAR
 		case IDC_CHECKST4:

 		case IDC_CHECKST5:

 		case IDC_CHECKST6:

-		case IDC_CHECKST7:

-		case IDC_CHECKST8:

-		case IDC_CHECKST9:

 		case IDC_CHECKPOP:

 		case IDC_OPENMESSAGE:

 		case IDC_CHECKCLIST:

diff --git a/plugins/Nudge/src/resource.h b/plugins/Nudge/src/resource.h
index 6236ae9500..e6ef117378 100644
--- a/plugins/Nudge/src/resource.h
+++ b/plugins/Nudge/src/resource.h
@@ -48,10 +48,7 @@
 #define IDC_CHECKST4                    1023

 #define IDC_CHECKST5                    1024

 #define IDC_CHECKST6                    1025

-#define IDC_CHECKST7                    1026

 #define IDC_POPUPTEXTCOLOR              1027

-#define IDC_CHECKST8                    1028

-#define IDC_CHECKST9                    1029

 #define IDC_BGCOLOUR                    1030

 #define IDC_PROTOLIST                   1031

 #define IDC_TEXTCOLOUR                  1032

diff --git a/plugins/SeenPlugin/src/utils.cpp b/plugins/SeenPlugin/src/utils.cpp
index ac5c17ff91..27c20abc76 100644
--- a/plugins/SeenPlugin/src/utils.cpp
+++ b/plugins/SeenPlugin/src/utils.cpp
@@ -424,10 +424,7 @@ DWORD StatusColors15bits[] = {
 	0x295C0000, // 0x005050E0, 0x00000000, DND - DarkRed

 	0x5EFD0000, // 0x00B8B8E8, 0x00000000, Not available - LightRed

 	0x295C0000, // 0x005050E0, 0x00000000, Occupied

-	0x43900000, // 0x0080E080, 0x00000000, Free for chat - LightGreen

-	0x76AF0000, // 0x00E8A878, 0x00000000, Invisible

-	0x431C0000, // 0x0080C0E0, 0x00000000, On the phone

-	0x5EFD0000, // 0x00B8B8E8, 0x00000000, Out to lunch

+	0x76AF0000  // 0x00E8A878, 0x00000000, Invisible

 };

 

 DWORD GetDWordFromColors(COLORREF First, COLORREF Second)