diff options
| author | George Hazan <ghazan@miranda.im> | 2018-12-28 13:05:02 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-12-28 13:05:02 +0300 |
| commit | a6fee0d53fb640868e010e0dc54b116d9d143ddf (patch) | |
| tree | aa9b865d88072262e5767ba29f228e8a9c7b457b /plugins/AddContactPlus | |
| parent | 9e8be78665b9f69a255f2d2d43254a1ae2834e36 (diff) | |
User added notifications:
- old obsoleted ICQ-related junk like PF4_FORCEADDED & PF1_ADDED removed;
- appropriate controls removed from auth dialogs and menus;
- fixes #1680 (ICQ10: disable "Auth request" and "Send you are added" in "Add contact" dialog)
Diffstat (limited to 'plugins/AddContactPlus')
| -rw-r--r-- | plugins/AddContactPlus/res/resource.rc | 3 | ||||
| -rw-r--r-- | plugins/AddContactPlus/src/addcontact.cpp | 6 | ||||
| -rw-r--r-- | plugins/AddContactPlus/src/resource.h | 1 |
3 files changed, 1 insertions, 9 deletions
diff --git a/plugins/AddContactPlus/res/resource.rc b/plugins/AddContactPlus/res/resource.rc index 1b1bde6444..0eae1c0918 100644 --- a/plugins/AddContactPlus/res/resource.rc +++ b/plugins/AddContactPlus/res/resource.rc @@ -90,8 +90,7 @@ BEGIN COMBOBOX IDC_GROUP,112,70,110,60,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
GROUPBOX "Options",IDC_STATIC,7,87,216,57
CONTROL "Add temporarily",IDC_ADDTEMP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,11,100,204,10
- CONTROL "Send ""You were added""",IDC_ADDED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,11,114,204,10
- CONTROL "Send authorization request",IDC_AUTH,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,11,128,204,10
+ CONTROL "Send authorization request",IDC_AUTH,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,11,114,204,10
GROUPBOX "Authorization request",IDC_AUTHGB,7,147,216,45
EDITTEXT IDC_AUTHREQ,13,157,204,29,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
DEFPUSHBUTTON "&Add",IDOK,20,198,72,14
diff --git a/plugins/AddContactPlus/src/addcontact.cpp b/plugins/AddContactPlus/src/addcontact.cpp index fa79e6976a..0de4893870 100644 --- a/plugins/AddContactPlus/src/addcontact.cpp +++ b/plugins/AddContactPlus/src/addcontact.cpp @@ -33,13 +33,11 @@ void AddContactDlgOpts(HWND hdlg, const char* szProto, BOOL bAuthOptsOnly = FALS {
DWORD flags = (szProto) ? CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_4, 0) : 0;
if (IsDlgButtonChecked(hdlg, IDC_ADDTEMP)) {
- EnableWindow(GetDlgItem(hdlg, IDC_ADDED), FALSE);
EnableWindow(GetDlgItem(hdlg, IDC_AUTH), FALSE);
EnableWindow(GetDlgItem(hdlg, IDC_AUTHREQ), FALSE);
EnableWindow(GetDlgItem(hdlg, IDC_AUTHGB), FALSE);
}
else {
- EnableWindow(GetDlgItem(hdlg, IDC_ADDED), !(flags & PF4_FORCEADDED));
EnableWindow(GetDlgItem(hdlg, IDC_AUTH), !(flags & PF4_FORCEAUTH));
EnableWindow(GetDlgItem(hdlg, IDC_AUTHREQ), (flags & PF4_NOCUSTOMAUTH) ? FALSE : IsDlgButtonChecked(hdlg, IDC_AUTH));
EnableWindow(GetDlgItem(hdlg, IDC_AUTHGB), (flags & PF4_NOCUSTOMAUTH) ? FALSE : IsDlgButtonChecked(hdlg, IDC_AUTH));
@@ -178,7 +176,6 @@ INT_PTR CALLBACK AddContactDlgProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM) }
if (AddContactDlgAccounts(hdlg, acs)) {
// By default check these checkboxes
- CheckDlgButton(hdlg, IDC_ADDED, BST_CHECKED);
CheckDlgButton(hdlg, IDC_AUTH, BST_CHECKED);
AddContactDlgOpts(hdlg, acs->proto);
EnableWindow(GetDlgItem(hdlg, IDOK), FALSE);
@@ -268,9 +265,6 @@ INT_PTR CALLBACK AddContactDlgProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM) if (BST_UNCHECKED == IsDlgButtonChecked(hdlg, IDC_ADDTEMP)) {
db_unset(hContact, "CList", "NotOnList");
- if (IsDlgButtonChecked(hdlg, IDC_ADDED))
- ProtoChainSend(hContact, PSS_ADDED, 0, 0);
-
if (IsDlgButtonChecked(hdlg, IDC_AUTH)) {
DWORD flags = CallProtoService(acs->proto, PS_GETCAPS, PFLAGNUM_4, 0);
if (flags & PF4_NOCUSTOMAUTH)
diff --git a/plugins/AddContactPlus/src/resource.h b/plugins/AddContactPlus/src/resource.h index b796c401d0..ae188615d4 100644 --- a/plugins/AddContactPlus/src/resource.h +++ b/plugins/AddContactPlus/src/resource.h @@ -6,7 +6,6 @@ #define IDI_ADDCONTACT 102
#define IDC_MYHANDLE 1000
#define IDC_GROUP 1001
-#define IDC_ADDED 1002
#define IDC_AUTH 1003
#define IDC_AUTHGB 1004
#define IDC_AUTHREQ 1005
|