From ef1a349d88912a89a8dd20ca1dcb342b6dc9c2ff Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Mon, 27 May 2019 18:45:43 +0300
Subject: fixes #1963 (Remove Free for Chat, On the Phone and Out to Lunch
 statuses completely)

---
 plugins/BuddyPounce/src/dialog.cpp | 17 +++++++----------
 plugins/BuddyPounce/src/main.cpp   |  6 ------
 plugins/BuddyPounce/src/stdafx.h   |  5 +----
 3 files changed, 8 insertions(+), 20 deletions(-)

(limited to 'plugins/BuddyPounce/src')

diff --git a/plugins/BuddyPounce/src/dialog.cpp b/plugins/BuddyPounce/src/dialog.cpp
index 210d11dce3..9421b8e51d 100644
--- a/plugins/BuddyPounce/src/dialog.cpp
+++ b/plugins/BuddyPounce/src/dialog.cpp
@@ -165,16 +165,13 @@ void statusModes(windowInfo *wi, int myStatusMode) // myStatusMode=1 sendIfMySta
 			SetDlgItemText(hwnd, IDC_CHECK10, TranslateT("To Out to lunch"));
 		}
 	}
-	CheckDlgButton(hwnd, IDC_CHECK1, statusFlag&ANY ? BST_CHECKED : BST_UNCHECKED);
-	CheckDlgButton(hwnd, IDC_CHECK2, (statusFlag&ONLINE) >> 1 ? BST_CHECKED : BST_UNCHECKED);
-	CheckDlgButton(hwnd, IDC_CHECK3, (statusFlag&AWAY) >> 2 ? BST_CHECKED : BST_UNCHECKED);
-	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&FFC) >> 6 ? BST_CHECKED : BST_UNCHECKED);
-	CheckDlgButton(hwnd, IDC_CHECK8, (statusFlag&INVISIBLE) >> 7 ? BST_CHECKED : BST_UNCHECKED);
-	CheckDlgButton(hwnd, IDC_CHECK9, (statusFlag&PHONE) >> 8 ? BST_CHECKED : BST_UNCHECKED);
-	CheckDlgButton(hwnd, IDC_CHECK10, (statusFlag&LUNCH) >> 9 ? BST_CHECKED : BST_UNCHECKED);
+	CheckDlgButton(hwnd, IDC_CHECK1, (statusFlag & ANY) ? BST_CHECKED : BST_UNCHECKED);
+	CheckDlgButton(hwnd, IDC_CHECK2, (statusFlag & ONLINE) >> 1 ? BST_CHECKED : BST_UNCHECKED);
+	CheckDlgButton(hwnd, IDC_CHECK3, (statusFlag & AWAY) >> 2 ? BST_CHECKED : BST_UNCHECKED);
+	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);
 }
 
 void deletePounce(MCONTACT hContact)
diff --git a/plugins/BuddyPounce/src/main.cpp b/plugins/BuddyPounce/src/main.cpp
index ea2fd39dba..c20ac1913a 100644
--- a/plugins/BuddyPounce/src/main.cpp
+++ b/plugins/BuddyPounce/src/main.cpp
@@ -97,14 +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);
-	case ID_STATUS_OUTTOLUNCH:
-		return (statusFlag & LUNCH);
-	case ID_STATUS_ONTHEPHONE:
-		return (statusFlag & PHONE);
 	}
 	return 0;
 }
diff --git a/plugins/BuddyPounce/src/stdafx.h b/plugins/BuddyPounce/src/stdafx.h
index 71bf03508d..14808a2ac5 100644
--- a/plugins/BuddyPounce/src/stdafx.h
+++ b/plugins/BuddyPounce/src/stdafx.h
@@ -43,10 +43,7 @@ struct CMPlugin : public PLUGIN<CMPlugin>
 #define NA 8
 #define OCCUPIED 16
 #define DND 32
-#define FFC 64
-#define INVISIBLE 128
-#define PHONE 256
-#define LUNCH 512
+#define INVISIBLE 64
 
 //=======================================================
 //  Variables
-- 
cgit v1.2.3