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

3 files changed, 10 insertions, 17 deletions

diff --git a/plugins/SimpleStatusMsg/src/main.cpp b/plugins/SimpleStatusMsg/src/main.cpp
index ff3b8dde0e..ca42180c0f 100644
--- a/plugins/SimpleStatusMsg/src/main.cpp
+++ b/plugins/SimpleStatusMsg/src/main.cpp
@@ -492,8 +492,7 @@ int CheckProtoSettings(const char *szProto, int iInitialStatus)
 		case 2: return ID_STATUS_AWAY;

 		case 3: return ID_STATUS_NA;

 		case 4: return ID_STATUS_DND;

-		case 5: return ID_STATUS_FREECHAT;

-		case 6: return ID_STATUS_INVISIBLE;

+		case 5: return ID_STATUS_INVISIBLE;

 		default: return iInitialStatus;

 		}

 	}

@@ -561,7 +560,7 @@ int HasProtoStaticStatusMsg(const char *szProto, int iInitialStatus, int iStatus
 

 INT_PTR SetStatusModeFromExtern(WPARAM wParam, LPARAM lParam)

 {

-	if ((wParam < ID_STATUS_OFFLINE && wParam != 0) || (wParam > ID_STATUS_OUTTOLUNCH && wParam != ID_STATUS_CURRENT))

+	if ((wParam < ID_STATUS_OFFLINE && wParam != 0) || (wParam > ID_STATUS_MAX && wParam != ID_STATUS_CURRENT))

 		return 0;

 

 	int newStatus = (int)wParam;

@@ -1353,7 +1352,7 @@ static int OnIdleChanged(WPARAM, LPARAM lParam)
 

 		// we're entering idle

 		if (lParam & IDF_ISIDLE) {

-			if (!db_get_b(0, "AutoAway", pa->szModuleName, 0) && iCurrentStatus != ID_STATUS_ONLINE && iCurrentStatus != ID_STATUS_FREECHAT)

+			if (!db_get_b(0, "AutoAway", pa->szModuleName, 0) && iCurrentStatus != ID_STATUS_ONLINE)

 				return 0;

 		}

 		else {

diff --git a/plugins/SimpleStatusMsg/src/options.cpp b/plugins/SimpleStatusMsg/src/options.cpp
index e5cdae1fde..d733c4a376 100644
--- a/plugins/SimpleStatusMsg/src/options.cpp
+++ b/plugins/SimpleStatusMsg/src/options.cpp
@@ -122,7 +122,7 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 

 			data->status_msg = (struct SingleStatusMsg *)mir_alloc(sizeof(struct SingleStatusMsg)*(accounts->count + 1));

 

-			for (i = ID_STATUS_ONLINE; i <= ID_STATUS_OUTTOLUNCH; i++) {

+			for (i = ID_STATUS_ONLINE; i <= ID_STATUS_MAX; i++) {

 				if (accounts->statusMsgFlags & Proto_Status2Flag(i)) {

 					index = SendDlgItemMessage(hwndDlg, IDC_CBOPTSTATUS, CB_INSERTSTRING, -1, (LPARAM)Clist_GetStatusModeDescription(i, 0));

 					if (index != CB_ERR && index != CB_ERRSPACE) {

@@ -365,7 +365,7 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 					int j = SendDlgItemMessage(hwndDlg, IDC_CBOPTSTATUS, CB_GETITEMDATA, (WPARAM)SendDlgItemMessage(hwndDlg, IDC_CBOPTSTATUS, CB_GETCURSEL, 0, 0), 0);

 					SendDlgItemMessage(hwndDlg, IDC_CBOPTSTATUS, CB_RESETCONTENT, 0, 0);

 

-					for (l = ID_STATUS_ONLINE; l <= ID_STATUS_OUTTOLUNCH; l++) {

+					for (l = ID_STATUS_ONLINE; l <= ID_STATUS_MAX; l++) {

 						int	 index;

 						if (status_modes & Proto_Status2Flag(l)) {

 							index = SendDlgItemMessage(hwndDlg, IDC_CBOPTSTATUS, CB_INSERTSTRING, -1, (LPARAM)Clist_GetStatusModeDescription(l, 0));

@@ -797,7 +797,7 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 				int j = SendDlgItemMessage(hwndDlg, IDC_CBOPTPROTO, CB_GETITEMDATA, (WPARAM)SendDlgItemMessage(hwndDlg, IDC_CBOPTPROTO, CB_GETCURSEL, 0, 0), 0);

 

 				if (j) {

-					for (int i = ID_STATUS_ONLINE; i <= ID_STATUS_OUTTOLUNCH; i++) {

+					for (int i = ID_STATUS_ONLINE; i <= ID_STATUS_MAX; i++) {

 						if (accounts->statusMsgFlags & Proto_Status2Flag(i)) {

 							data->status_msg[0].flags[i - ID_STATUS_ONLINE] = data->status_msg[j].flags[i - ID_STATUS_ONLINE];

 							if (data->status_msg[j].flags[i - ID_STATUS_ONLINE] & STATUS_THIS_MSG)

@@ -834,7 +834,7 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 							}

 						}

 						else if (data->proto_msg[j].flags & PROTO_POPUPDLG) {

-							for (int i = ID_STATUS_ONLINE; i <= ID_STATUS_OUTTOLUNCH; i++) {

+							for (int i = ID_STATUS_ONLINE; i <= ID_STATUS_MAX; i++) {

 								if (CallProtoService(pa->szModuleName, PS_GETCAPS, PFLAGNUM_3, 0) & Proto_Status2Flag(i)) {

 									data->status_msg[k + 1].flags[i - ID_STATUS_ONLINE] = data->status_msg[j].flags[i - ID_STATUS_ONLINE];

 									if (data->status_msg[j].flags[i - ID_STATUS_ONLINE] & STATUS_THIS_MSG)

@@ -858,7 +858,7 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 				else

 					status_modes = accounts->statusMsgFlags;

 

-				for (int k = ID_STATUS_ONLINE; k <= ID_STATUS_OUTTOLUNCH; k++) {

+				for (int k = ID_STATUS_ONLINE; k <= ID_STATUS_MAX; k++) {

 					if (k - ID_STATUS_ONLINE != i && status_modes & Proto_Status2Flag(k)) {

 						data->status_msg[j].flags[k - ID_STATUS_ONLINE] = data->status_msg[j].flags[i];

 						if (data->status_msg[j].flags[i] & STATUS_THIS_MSG)

@@ -873,7 +873,7 @@ INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 	case WM_NOTIFY:

 		if (((LPNMHDR)lParam)->idFrom == 0 && ((LPNMHDR)lParam)->code == PSN_APPLY) {

 			char szSetting[80];

-			for (int i = ID_STATUS_ONLINE; i <= ID_STATUS_OUTTOLUNCH; i++) {

+			for (int i = ID_STATUS_ONLINE; i <= ID_STATUS_MAX; i++) {

 				if (accounts->statusMsgFlags & Proto_Status2Flag(i)) {

 					db_set_ws(0, "SRAway", StatusModeToDbSetting(i, "Default"), data->status_msg[0].msg[i - ID_STATUS_ONLINE]);

 					g_plugin.setByte(StatusModeToDbSetting(i, "Flags"), (BYTE)data->status_msg[0].flags[i - ID_STATUS_ONLINE]);

@@ -1419,7 +1419,7 @@ static INT_PTR CALLBACK DlgStatusOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wPa
 					int status_modes = CallProtoService(pa->szModuleName, PS_GETCAPS, PFLAGNUM_2, 0) & ~CallProtoService(pa->szModuleName, PS_GETCAPS, PFLAGNUM_5, 0);

 

 					SendDlgItemMessage(hwndDlg, IDC_LISTSTATUS, LB_RESETCONTENT, 0, 0);

-					for (int l = ID_STATUS_OFFLINE; l <= ID_STATUS_OUTTOLUNCH; l++) {

+					for (int l = ID_STATUS_OFFLINE; l <= ID_STATUS_MAX; l++) {

 						if (status_modes & Proto_Status2Flag(l) || l == ID_STATUS_OFFLINE) {

 							int index = SendDlgItemMessage(hwndDlg, IDC_LISTSTATUS, LB_INSERTSTRING, -1, (LPARAM)Clist_GetStatusModeDescription(l, 0));

 							if (index != LB_ERR && index != LB_ERRSPACE) {

diff --git a/plugins/SimpleStatusMsg/src/utils.cpp b/plugins/SimpleStatusMsg/src/utils.cpp
index a3ba96c977..3fd0d1b8d2 100644
--- a/plugins/SimpleStatusMsg/src/utils.cpp
+++ b/plugins/SimpleStatusMsg/src/utils.cpp
@@ -79,12 +79,9 @@ const wchar_t *GetDefaultMessage(int status)
 	case ID_STATUS_NA: return TranslateT("Give it up, I'm not in!");

 	case ID_STATUS_OCCUPIED: return TranslateT("Not right now.");

 	case ID_STATUS_DND: return TranslateT("Give a guy some peace, would ya?");

-	case ID_STATUS_FREECHAT: return TranslateT("I'm a chatbot!");

 	case ID_STATUS_ONLINE: return TranslateT("Yep, I'm here.");

 	case ID_STATUS_OFFLINE: return TranslateT("Nope, not here.");

 	case ID_STATUS_INVISIBLE: return TranslateT("I'm hiding from the mafia.");

-	case ID_STATUS_ONTHEPHONE: return TranslateT("That'll be the phone.");

-	case ID_STATUS_OUTTOLUNCH: return TranslateT("Mmm... food.");

 	case ID_STATUS_IDLE: return TranslateT("idleeeeeeee");

 	}

 	return nullptr;

@@ -100,12 +97,9 @@ const char *StatusModeToDbSetting(int status, const char *suffix)
 	case ID_STATUS_NA: prefix = "Na"; break;

 	case ID_STATUS_DND: prefix = "Dnd"; break;

 	case ID_STATUS_OCCUPIED: prefix = "Occupied"; break;

-	case ID_STATUS_FREECHAT: prefix = "FreeChat"; break;

 	case ID_STATUS_ONLINE: prefix = "On"; break;

 	case ID_STATUS_OFFLINE: prefix = "Off"; break;

 	case ID_STATUS_INVISIBLE: prefix = "Inv"; break;

-	case ID_STATUS_ONTHEPHONE: prefix = "Otp"; break;

-	case ID_STATUS_OUTTOLUNCH: prefix = "Otl"; break;

 	case ID_STATUS_IDLE: prefix = "Idl"; break;

 	default: return nullptr;

 	}