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

8 files changed, 0 insertions, 17 deletions

diff --git a/plugins/WinterSpeak/src/AnnounceDatabase.h b/plugins/WinterSpeak/src/AnnounceDatabase.h
index 06014843ac..1d1629851a 100644
--- a/plugins/WinterSpeak/src/AnnounceDatabase.h
+++ b/plugins/WinterSpeak/src/AnnounceDatabase.h
@@ -14,7 +14,6 @@ class AnnounceDatabase
 		StatusFlag_Dnd,

 		StatusFlag_Na,

 		StatusFlag_Occupied,

-		StatusFlag_FreeForChat,

 		StatusFlag_Invisible,

 		StatusFlag_SpeakStatusMsg,

 		StatusFlag_SuppressConnect,

diff --git a/plugins/WinterSpeak/src/AnnounceDialog.cpp b/plugins/WinterSpeak/src/AnnounceDialog.cpp
index eb07e5fa5b..1fd67a492a 100644
--- a/plugins/WinterSpeak/src/AnnounceDialog.cpp
+++ b/plugins/WinterSpeak/src/AnnounceDialog.cpp
@@ -60,7 +60,6 @@ void AnnounceDialog::command(HWND window, int control)
 	  case IDC_STATUS_DND:

 	  case IDC_STATUS_NA:

 	  case IDC_STATUS_OCCUPIED:

-	  case IDC_STATUS_FREEFORCHAT:

 	  case IDC_STATUS_INVISIBLE:

 	  case IDC_SPEAK_STATUS_MSG:

 	  case IDC_SUPPRESS_CONNECT:

@@ -97,7 +96,6 @@ AnnounceDialog::load(HWND window)
 	CheckDlgButton(window, IDC_STATUS_DND, m_db.getStatusFlag(AnnounceDatabase::StatusFlag_Dnd) ? BST_CHECKED : BST_UNCHECKED);

 	CheckDlgButton(window, IDC_STATUS_NA, m_db.getStatusFlag(AnnounceDatabase::StatusFlag_Na) ? BST_CHECKED : BST_UNCHECKED);

 	CheckDlgButton(window, IDC_STATUS_OCCUPIED, m_db.getStatusFlag(AnnounceDatabase::StatusFlag_Occupied) ? BST_CHECKED : BST_UNCHECKED);

-	CheckDlgButton(window, IDC_STATUS_FREEFORCHAT, m_db.getStatusFlag(AnnounceDatabase::StatusFlag_FreeForChat) ? BST_CHECKED : BST_UNCHECKED);

 	CheckDlgButton(window, IDC_STATUS_INVISIBLE, m_db.getStatusFlag(AnnounceDatabase::StatusFlag_Invisible) ? BST_CHECKED : BST_UNCHECKED);

 	CheckDlgButton(window, IDC_SPEAK_STATUS_MSG, m_db.getStatusFlag(AnnounceDatabase::StatusFlag_SpeakStatusMsg) ? BST_CHECKED : BST_UNCHECKED);

 	CheckDlgButton(window, IDC_SUPPRESS_CONNECT, m_db.getStatusFlag(AnnounceDatabase::StatusFlag_SuppressConnect) ? BST_CHECKED : BST_UNCHECKED);

@@ -125,7 +123,6 @@ AnnounceDialog::save(HWND window)
 	m_db.setStatusFlag(AnnounceDatabase::StatusFlag_Dnd,		(IsDlgButtonChecked(window, IDC_STATUS_DND) != 0));

 	m_db.setStatusFlag(AnnounceDatabase::StatusFlag_Na,		(IsDlgButtonChecked(window, IDC_STATUS_NA) != 0));

 	m_db.setStatusFlag(AnnounceDatabase::StatusFlag_Occupied,		(IsDlgButtonChecked(window, IDC_STATUS_OCCUPIED) != 0));

-	m_db.setStatusFlag(AnnounceDatabase::StatusFlag_FreeForChat,		(IsDlgButtonChecked(window, IDC_STATUS_FREEFORCHAT) != 0));

 	m_db.setStatusFlag(AnnounceDatabase::StatusFlag_Invisible,		(IsDlgButtonChecked(window, IDC_STATUS_INVISIBLE) != 0));

 	m_db.setStatusFlag(AnnounceDatabase::StatusFlag_SpeakStatusMsg,		(IsDlgButtonChecked(window, IDC_SPEAK_STATUS_MSG) != 0));

 	m_db.setStatusFlag(AnnounceDatabase::StatusFlag_SuppressConnect,		(IsDlgButtonChecked(window, IDC_SUPPRESS_CONNECT) != 0));

diff --git a/plugins/WinterSpeak/src/ConfigDatabase.h b/plugins/WinterSpeak/src/ConfigDatabase.h
index 4e7f546aa1..668f38d47d 100644
--- a/plugins/WinterSpeak/src/ConfigDatabase.h
+++ b/plugins/WinterSpeak/src/ConfigDatabase.h
@@ -17,7 +17,6 @@ public:
         ActiveFlag_Dnd,

         ActiveFlag_Na,

         ActiveFlag_Occupied,

-        ActiveFlag_FreeForChat,

         ActiveFlag_Invisible

     };

 

diff --git a/plugins/WinterSpeak/src/DialogConfigActive.cpp b/plugins/WinterSpeak/src/DialogConfigActive.cpp
index dad1d5153b..be288305d9 100644
--- a/plugins/WinterSpeak/src/DialogConfigActive.cpp
+++ b/plugins/WinterSpeak/src/DialogConfigActive.cpp
@@ -58,7 +58,6 @@ INT_PTR CALLBACK DialogConfigActive::process(HWND window, UINT message, WPARAM w
 		case IDC_ACTIVE_DND:

 		case IDC_ACTIVE_NA:

 		case IDC_ACTIVE_OCCUPIED:

-		case IDC_ACTIVE_FREEFORCHAT:

 		case IDC_ACTIVE_INVISIBLE:

 			m_instance->changed(window);

 			break;

@@ -150,7 +149,6 @@ void DialogConfigActive::load(HWND window)
 	CheckDlgButton(window, IDC_ACTIVE_DND, m_db.getActiveFlag(ConfigDatabase::ActiveFlag_Dnd) ? BST_CHECKED : BST_UNCHECKED);

 	CheckDlgButton(window, IDC_ACTIVE_NA, m_db.getActiveFlag(ConfigDatabase::ActiveFlag_Na) ? BST_CHECKED : BST_UNCHECKED);

 	CheckDlgButton(window, IDC_ACTIVE_OCCUPIED, m_db.getActiveFlag(ConfigDatabase::ActiveFlag_Occupied) ? BST_CHECKED : BST_UNCHECKED);

-	CheckDlgButton(window, IDC_ACTIVE_FREEFORCHAT, m_db.getActiveFlag(ConfigDatabase::ActiveFlag_FreeForChat) ? BST_CHECKED : BST_UNCHECKED);

 	CheckDlgButton(window, IDC_ACTIVE_INVISIBLE, m_db.getActiveFlag(ConfigDatabase::ActiveFlag_Invisible) ? BST_CHECKED : BST_UNCHECKED);

 

 	HWND listview = GetDlgItem(window, IDC_ACTIVE_USERS);

@@ -322,7 +320,6 @@ void DialogConfigActive::save(HWND window)
 	m_db.setActiveFlag(ConfigDatabase::ActiveFlag_Dnd, (IsDlgButtonChecked(window, IDC_ACTIVE_DND) != 0));

 	m_db.setActiveFlag(ConfigDatabase::ActiveFlag_Na, (IsDlgButtonChecked(window, IDC_ACTIVE_NA) != 0));

 	m_db.setActiveFlag(ConfigDatabase::ActiveFlag_Occupied, (IsDlgButtonChecked(window, IDC_ACTIVE_OCCUPIED) != 0));

-	m_db.setActiveFlag(ConfigDatabase::ActiveFlag_FreeForChat, (IsDlgButtonChecked(window, IDC_ACTIVE_FREEFORCHAT) != 0));

 	m_db.setActiveFlag(ConfigDatabase::ActiveFlag_Invisible, (IsDlgButtonChecked(window, IDC_ACTIVE_INVISIBLE) != 0));

 

 	for (auto &hContact : Contacts()) {

diff --git a/plugins/WinterSpeak/src/SpeakAnnounce.cpp b/plugins/WinterSpeak/src/SpeakAnnounce.cpp
index e9b8160138..87f01038d4 100644
--- a/plugins/WinterSpeak/src/SpeakAnnounce.cpp
+++ b/plugins/WinterSpeak/src/SpeakAnnounce.cpp
@@ -48,9 +48,6 @@ void SpeakAnnounce::statusChange(DBCONTACTWRITESETTING *write_setting, MCONTACT
 	  case ID_STATUS_OCCUPIED:

 		speak = m_db.getStatusFlag(AnnounceDatabase::StatusFlag_Occupied);

 		break;

-	  case ID_STATUS_FREECHAT:

-		speak = m_db.getStatusFlag(AnnounceDatabase::StatusFlag_FreeForChat);

-		break;

 	  case ID_STATUS_INVISIBLE:

 		speak = m_db.getStatusFlag(AnnounceDatabase::StatusFlag_Invisible);

 		break;

diff --git a/plugins/WinterSpeak/src/SpeakConfig.cpp b/plugins/WinterSpeak/src/SpeakConfig.cpp
index 1d0d4185d7..b02de945c3 100644
--- a/plugins/WinterSpeak/src/SpeakConfig.cpp
+++ b/plugins/WinterSpeak/src/SpeakConfig.cpp
@@ -68,9 +68,6 @@ bool SpeakConfig::say(const std::wstring &sentence, MCONTACT user, bool message)
 		case ID_STATUS_OCCUPIED:

 			active = m_db.getActiveFlag(ConfigDatabase::ActiveFlag_Occupied);

 			break;

-		case ID_STATUS_FREECHAT:

-			active = m_db.getActiveFlag(ConfigDatabase::ActiveFlag_FreeForChat);

-			break;

 		case ID_STATUS_INVISIBLE:

 			active = m_db.getActiveFlag(ConfigDatabase::ActiveFlag_Invisible);

 			break;

diff --git a/plugins/WinterSpeak/src/UserInformation.cpp b/plugins/WinterSpeak/src/UserInformation.cpp
index 7769261257..bdf89ec6e6 100644
--- a/plugins/WinterSpeak/src/UserInformation.cpp
+++ b/plugins/WinterSpeak/src/UserInformation.cpp
@@ -11,7 +11,6 @@ UserInformation::UserInformation() : m_status_info(), m_status_strings() {
 	m_status_strings[ID_STATUS_NA]        = LPGENW("%u is not available");

 	m_status_strings[ID_STATUS_DND]       = LPGENW("%u does not want to be disturbed");

 	m_status_strings[ID_STATUS_OCCUPIED]  = LPGENW("%u is occupied");

-	m_status_strings[ID_STATUS_FREECHAT]  = LPGENW("%u is free for chat");

 }

 

 //------------------------------------------------------------------------------

diff --git a/plugins/WinterSpeak/src/resource.h b/plugins/WinterSpeak/src/resource.h
index a4e8e7ed1c..c7aca68d1a 100644
--- a/plugins/WinterSpeak/src/resource.h
+++ b/plugins/WinterSpeak/src/resource.h
@@ -23,7 +23,6 @@
 #define IDC_ACTIVE_DND                  1011

 #define IDC_ACTIVE_NA                   1012

 #define IDC_ACTIVE_OCCUPIED             1013

-#define IDC_ACTIVE_FREEFORCHAT          1014

 #define IDC_ACTIVE_INVISIBLE            1015

 #define IDC_BUTTON_TEST                 1016

 #define IDC_STATUS_OFFLINE              1100

@@ -32,7 +31,6 @@
 #define IDC_STATUS_DND                  1103

 #define IDC_STATUS_NA                   1104

 #define IDC_STATUS_OCCUPIED             1105

-#define IDC_STATUS_FREEFORCHAT          1106

 #define IDC_STATUS_INVISIBLE            1107

 #define IDC_SPEAK_STATUS_MSG            1108

 #define IDC_EVENT_MESSAGE               1109