Restore "Free for chat" status support (fixes #1963)

4 files changed, 15 insertions, 5 deletions

diff --git a/plugins/BuddyPounce/src/dialog.cpp b/plugins/BuddyPounce/src/dialog.cpp
index db306951f4..1e1ef44a5c 100644
--- a/plugins/BuddyPounce/src/dialog.cpp
+++ b/plugins/BuddyPounce/src/dialog.cpp
@@ -97,7 +97,8 @@ 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_CHECK7) << 6)

+				| (IsDlgButtonChecked(hwnd, IDC_CHECK8) << 7);

 

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

 				if (LOWORD(wParam) == IDOK)

@@ -135,7 +136,8 @@ 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("Invisible"));

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

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

 		}

 	}

 	else {

@@ -153,7 +155,8 @@ 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 Invisible"));

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

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

 		}

 	}

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

@@ -162,7 +165,8 @@ 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_CHECK7, (statusFlag & INVISIBLE) >> 6 ? BST_CHECKED : BST_UNCHECKED);

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

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

 }

 

 void deletePounce(MCONTACT hContact)

diff --git a/plugins/BuddyPounce/src/main.cpp b/plugins/BuddyPounce/src/main.cpp
index c20ac1913a..19a9b86bbd 100644
--- a/plugins/BuddyPounce/src/main.cpp
+++ b/plugins/BuddyPounce/src/main.cpp
@@ -97,6 +97,8 @@ int statusCheck(int statusFlag, int status)
 		return (statusFlag & OCCUPIED);

 	case ID_STATUS_DND:

 		return (statusFlag & DND);

+	case ID_STATUS_FREECHAT:

+		return (statusFlag & FFC);

 	case ID_STATUS_INVISIBLE:

 		return (statusFlag & INVISIBLE);

 	}

diff --git a/plugins/BuddyPounce/src/resource.h b/plugins/BuddyPounce/src/resource.h
index 91afce81c7..d9f13a992e 100644
--- a/plugins/BuddyPounce/src/resource.h
+++ b/plugins/BuddyPounce/src/resource.h
@@ -17,12 +17,14 @@
 #define CHK_NA                          1006

 #define CHK_OCCUPIED                    1007

 #define CHK_DND                         1008

+#define CHK_FFC                         1009

 #define CHK_ANYSTATUS                   1012

 #define CHK_ONLINE2                     1013

 #define CHK_AWAY2                       1014

 #define CHK_NA2                         1015

 #define CHK_OCCUPIED2                   1016

 #define CHK_DND2                        1017

+#define CHK_FFC2                        1018

 #define CHK_REUSE                       1028

 #define IDC_REUSETIMES                  1029

 #define CHK_GIVEUP                      1030

@@ -56,6 +58,7 @@
 #define IDC_CHECK5                      1085

 #define IDC_CHECK6                      1086

 #define IDC_CHECK7                      1087

+#define IDC_CHECK8                      1088

 #define IDC_SETTINGMSG2                 1095

 #define IDC_USEADVANCED                 1096

 #define IDC_SHOWDELIVERYMSGS            1097

diff --git a/plugins/BuddyPounce/src/stdafx.h b/plugins/BuddyPounce/src/stdafx.h
index 14808a2ac5..dcebbbcd04 100644
--- a/plugins/BuddyPounce/src/stdafx.h
+++ b/plugins/BuddyPounce/src/stdafx.h
@@ -43,7 +43,8 @@ struct CMPlugin : public PLUGIN<CMPlugin>
 #define NA 8

 #define OCCUPIED 16

 #define DND 32

-#define INVISIBLE 64

+#define FFC 64

+#define INVISIBLE 128

 

 //=======================================================

 //  Variables