diff options
| author | George Hazan <ghazan@miranda.im> | 2019-05-27 18:45:43 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-05-27 18:45:43 +0300 |
| commit | ef1a349d88912a89a8dd20ca1dcb342b6dc9c2ff (patch) | |
| tree | 78e6344d923966b7a8f1866763d6bacaf054a9e2 /plugins/YARelay/src | |
| parent | 189f6be24f11066a3c711b783cf98f79f703e3a5 (diff) | |
fixes #1963 (Remove Free for Chat, On the Phone and Out to Lunch statuses completely)
Diffstat (limited to 'plugins/YARelay/src')
| -rw-r--r-- | plugins/YARelay/src/main.cpp | 1 | ||||
| -rw-r--r-- | plugins/YARelay/src/options.cpp | 6 | ||||
| -rw-r--r-- | plugins/YARelay/src/resource.h | 1 | ||||
| -rw-r--r-- | plugins/YARelay/src/stdafx.h | 3 |
4 files changed, 3 insertions, 8 deletions
diff --git a/plugins/YARelay/src/main.cpp b/plugins/YARelay/src/main.cpp index 4a29fedc9f..db2ddb9847 100644 --- a/plugins/YARelay/src/main.cpp +++ b/plugins/YARelay/src/main.cpp @@ -105,7 +105,6 @@ static int MessageEventAdded(WPARAM hContact, LPARAM hDBEvent) case ID_STATUS_NA: statMask = STATUS_NA ;break;
case ID_STATUS_OCCUPIED: statMask = STATUS_OCCUPIED ;break;
case ID_STATUS_DND: statMask = STATUS_DND ;break;
- case ID_STATUS_FREECHAT: statMask = STATUS_FREECHAT ;break;
case ID_STATUS_INVISIBLE:statMask = STATUS_INVISIBLE;break;
default: return 0;
}
diff --git a/plugins/YARelay/src/options.cpp b/plugins/YARelay/src/options.cpp index 7e4d1eceef..3f0f2639d2 100644 --- a/plugins/YARelay/src/options.cpp +++ b/plugins/YARelay/src/options.cpp @@ -95,8 +95,7 @@ static INT_PTR CALLBACK OptionsFrameProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, if (iForwardOnStatus & STATUS_NA ) CheckDlgButton(hwndDlg, IDC_CHECK4, BST_CHECKED);
if (iForwardOnStatus & STATUS_OCCUPIED ) CheckDlgButton(hwndDlg, IDC_CHECK5, BST_CHECKED);
if (iForwardOnStatus & STATUS_DND ) CheckDlgButton(hwndDlg, IDC_CHECK6, BST_CHECKED);
- if (iForwardOnStatus & STATUS_FREECHAT ) CheckDlgButton(hwndDlg, IDC_CHECK7, BST_CHECKED);
- if (iForwardOnStatus & STATUS_INVISIBLE) CheckDlgButton(hwndDlg, IDC_CHECK8, BST_CHECKED);
+ if (iForwardOnStatus & STATUS_INVISIBLE) CheckDlgButton(hwndDlg, IDC_CHECK7, BST_CHECKED);
// template
SetDlgItemText(hwndDlg, IDC_EDIT_TEMPLATE, tszForwardTemplate);
@@ -156,8 +155,7 @@ static INT_PTR CALLBACK OptionsFrameProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, if (IsDlgButtonChecked(hwndDlg, IDC_CHECK4) == BST_CHECKED) iForwardOnStatus |= STATUS_NA;
if (IsDlgButtonChecked(hwndDlg, IDC_CHECK5) == BST_CHECKED) iForwardOnStatus |= STATUS_OCCUPIED;
if (IsDlgButtonChecked(hwndDlg, IDC_CHECK6) == BST_CHECKED) iForwardOnStatus |= STATUS_DND;
- if (IsDlgButtonChecked(hwndDlg, IDC_CHECK7) == BST_CHECKED) iForwardOnStatus |= STATUS_FREECHAT;
- if (IsDlgButtonChecked(hwndDlg, IDC_CHECK8) == BST_CHECKED) iForwardOnStatus |= STATUS_INVISIBLE;
+ if (IsDlgButtonChecked(hwndDlg, IDC_CHECK7) == BST_CHECKED) iForwardOnStatus |= STATUS_INVISIBLE;
GetDlgItemText(hwndDlg, IDC_EDIT_TEMPLATE, tszForwardTemplate, _countof(tszForwardTemplate));
if (IsDlgButtonChecked(hwndDlg, IDC_CHECK_SPLIT) == BST_CHECKED) iSplit = 1; else iSplit = 0;
iSplitMaxSize = GetDlgItemInt(hwndDlg, IDC_EDIT_MAXSIZE, nullptr, FALSE);
diff --git a/plugins/YARelay/src/resource.h b/plugins/YARelay/src/resource.h index b9104ff1a1..b894e2d895 100644 --- a/plugins/YARelay/src/resource.h +++ b/plugins/YARelay/src/resource.h @@ -16,7 +16,6 @@ #define IDC_CHECK5 1008
#define IDC_CHECK6 1009
#define IDC_CHECK7 1010
-#define IDC_CHECK8 1011
#define IDC_EDIT_TEMPLATE 1012
#define IDC_CHECK_SPLIT 1013
#define IDC_EDIT_MAXSIZE 1014
diff --git a/plugins/YARelay/src/stdafx.h b/plugins/YARelay/src/stdafx.h index 85acbb020a..11a4d8fe31 100644 --- a/plugins/YARelay/src/stdafx.h +++ b/plugins/YARelay/src/stdafx.h @@ -41,8 +41,7 @@ Features: #define STATUS_NA 0x8
#define STATUS_OCCUPIED 0x10
#define STATUS_DND 0x20
-#define STATUS_FREECHAT 0x40
-#define STATUS_INVISIBLE 0x80
+#define STATUS_INVISIBLE 0x40
#define MAXTEMPLATESIZE 1024
|