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)

9 files changed, 4 insertions, 35 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

diff --git a/plugins/MenuItemEx/res/resource.rc b/plugins/MenuItemEx/res/resource.rc
index c291df7a18..0a8e96c35a 100644
--- a/plugins/MenuItemEx/res/resource.rc
+++ b/plugins/MenuItemEx/res/resource.rc
@@ -56,7 +56,6 @@ BEGIN
     CONTROL         "Ignore",IDC_IGNORE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,42,136,10

     CONTROL         "Copy to Account (Ctrl+click for move to Account)",IDC_PROTOS,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,54,251,10

-    CONTROL         "Send 'You were added'",IDC_ADDED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,66,136,10

     CONTROL         "Request Authorization",IDC_AUTHREQ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,78,136,10

     CONTROL         "Browse Received Files",IDC_RECVFILES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,90,136,10

     CONTROL         "Copy IP",IDC_COPYIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,102,136,10

diff --git a/plugins/MenuItemEx/src/main.cpp b/plugins/MenuItemEx/src/main.cpp
index c06be5f329..8acee13959 100644
--- a/plugins/MenuItemEx/src/main.cpp
+++ b/plugins/MenuItemEx/src/main.cpp
@@ -5,7 +5,6 @@
 #define MS_HIDE       "MenuEx/Hide"

 #define MS_IGNORE     "MenuEx/Ignore"

 #define MS_PROTO      "MenuEx/ChangeProto"

-#define MS_ADDED      "MenuEx/SendAdded"

 #define MS_AUTHREQ    "MenuEx/SendAuthReq"

 #define MS_COPYID     "MenuEx/CopyID"

 #define MS_RECVFILES  "MenuEx/RecvFiles"

@@ -16,7 +15,7 @@
 

 const int vf_default = VF_VS | VF_HFL | VF_IGN | VF_CID | VF_SHOWID | VF_RECV | VF_STAT | VF_SMNAME | VF_CIDN | VF_CIP;

 

-HGENMENU hmenuVis, hmenuOff, hmenuHide, hmenuIgnore, hmenuProto, hmenuAdded, hmenuAuthReq;

+HGENMENU hmenuVis, hmenuOff, hmenuHide, hmenuIgnore, hmenuProto, hmenuAuthReq;

 HGENMENU hmenuCopyID, hmenuRecvFiles, hmenuStatusMsg, hmenuCopyIP, hmenuCopyMirVer;

 static HGENMENU hIgnoreItem[9], hProtoItem[MAX_PROTOS];

 HICON hIcons[5];

@@ -410,13 +409,6 @@ static INT_PTR onSendAuthRequest(WPARAM wparam, LPARAM)
 	return 0;

 }

 

-static INT_PTR onSendAdded(WPARAM wparam, LPARAM)

-{

-	MCONTACT hContact = (MCONTACT)wparam;

-	ProtoChainSend(hContact, PSS_ADDED, 0, 0);

-	return 0;

-}

-

 // set the invisible-flag in db

 static INT_PTR onSetInvis(WPARAM wparam, LPARAM)

 {

@@ -796,7 +788,6 @@ static int BuildMenu(WPARAM wparam, LPARAM)
 	}

 	else Menu_ShowItem(hmenuProto, false);

 

-	Menu_ShowItem(hmenuAdded, (bShowAll || (flags & VF_ADD)) && bIsOnline && pa->IsEnabled());

 	Menu_ShowItem(hmenuAuthReq, (bShowAll || (flags & VF_REQ)) && bIsOnline && pa->IsEnabled());

 

 	bEnabled = bShowAll || (flags & VF_CID);

@@ -967,13 +958,6 @@ static int PluginInit(WPARAM, LPARAM)
 

 	mi.flags = CMIF_UNICODE;

 

-	SET_UID(mi, 0x3f031688, 0xe947, 0x4aba, 0xa3, 0xc4, 0xa7, 0x2c, 0xd0, 0xda, 0x88, 0xb4);

-	mi.position++;

-	mi.name.w = LPGENW("Send 'You were added'");

-	mi.pszService = MS_ADDED;

-	mi.hIcolibItem = Skin_LoadIcon(SKINICON_AUTH_ADD);

-	hmenuAdded = Menu_AddContactMenuItem(&mi);

-

 	SET_UID(mi, 0x332c5564, 0x6283, 0x43ff, 0xa2, 0xfc, 0x58, 0x29, 0x27, 0x83, 0xea, 0x1a);

 	mi.position++;

 	mi.name.w = LPGENW("Request authorization");

@@ -1035,7 +1019,6 @@ int CMPlugin::Load()
 	CreateServiceFunction(MS_HIDE, onHide);

 	CreateServiceFunction(MS_IGNORE, onIgnore);

 	CreateServiceFunction(MS_PROTO, onChangeProto);

-	CreateServiceFunction(MS_ADDED, onSendAdded);

 	CreateServiceFunction(MS_AUTHREQ, onSendAuthRequest);

 	CreateServiceFunction(MS_COPYID, onCopyID);

 	CreateServiceFunction(MS_RECVFILES, onRecvFiles);

diff --git a/plugins/MenuItemEx/src/options.cpp b/plugins/MenuItemEx/src/options.cpp
index be129fe14f..53788af1cf 100644
--- a/plugins/MenuItemEx/src/options.cpp
+++ b/plugins/MenuItemEx/src/options.cpp
@@ -17,7 +17,6 @@ static const checkboxes[] = {
 	{ IDC_IGNORE, VF_IGN },

 	{ IDC_IGNOREHIDE, VF_IGNH },

 	{ IDC_PROTOS, VF_PROTO },

-	{ IDC_ADDED, VF_ADD },

 	{ IDC_AUTHREQ, VF_REQ },

 	{ IDC_SHOWID, VF_SHOWID },

 	{ IDC_COPYIDNAME, VF_CIDN },

@@ -30,7 +29,7 @@ class COptDialog : public CDlgBase
 {

 	DWORD m_flags;

 

-	CCtrlCheck m_chkVis, m_chkAlpha, m_chkHide, m_chkIgnore, m_chkProtos, m_chkAdded, m_chkAuthReq, m_chkRecvFiles, m_chkCopyIP, m_chkCopyMirver, m_chkStatusMsg,

+	CCtrlCheck m_chkVis, m_chkAlpha, m_chkHide, m_chkIgnore, m_chkProtos, m_chkAuthReq, m_chkRecvFiles, m_chkCopyIP, m_chkCopyMirver, m_chkStatusMsg,

 		m_chkSMName, m_chkCopyID, m_chkCopyIDName, m_chkShowID, m_chkTrimID, m_chkIgnoreHide;

 	CCtrlLabel m_lblHint;

 

@@ -52,7 +51,6 @@ public:
 		m_chkHide(this, IDC_HIDE),

 		m_chkIgnore(this, IDC_IGNORE),

 		m_chkProtos(this, IDC_PROTOS),

-		m_chkAdded(this, IDC_ADDED),

 		m_chkAuthReq(this, IDC_AUTHREQ),

 		m_chkRecvFiles(this, IDC_RECVFILES),

 		m_chkCopyIP(this, IDC_COPYIP),

diff --git a/plugins/MenuItemEx/src/resource.h b/plugins/MenuItemEx/src/resource.h
index d988ca88c4..60b1aacf23 100644
--- a/plugins/MenuItemEx/src/resource.h
+++ b/plugins/MenuItemEx/src/resource.h
@@ -21,7 +21,6 @@
 #define IDC_HIDE                        1002

 #define IDC_IGNORE                      1003

 #define IDC_PROTOS                      1004

-#define IDC_ADDED                       1006

 #define IDC_AUTHREQ                     1007

 #define IDC_COPYID                      1008

 #define IDC_RECVFILES                   1009

diff --git a/plugins/MenuItemEx/src/stdafx.h b/plugins/MenuItemEx/src/stdafx.h
index 678d81f992..431f3faff8 100644
--- a/plugins/MenuItemEx/src/stdafx.h
+++ b/plugins/MenuItemEx/src/stdafx.h
@@ -53,7 +53,6 @@ int OptionsInit(WPARAM, LPARAM);
 #define VF_IGN		0x00000008

 #define VF_PROTO	0x00000010

 #define VF_SHOWID	0x00000020

-#define VF_ADD		0x00000040

 #define VF_REQ		0x00000080

 #define VF_CID		0x00000100

 #define VF_RECV		0x00000200

diff --git a/plugins/Weather/src/weather_svcs.cpp b/plugins/Weather/src/weather_svcs.cpp
index e4d8d6e5ff..61c03c473c 100644
--- a/plugins/Weather/src/weather_svcs.cpp
+++ b/plugins/Weather/src/weather_svcs.cpp
@@ -67,8 +67,7 @@ INT_PTR WeatherGetCaps(WPARAM wParam, LPARAM)
 		break;

 

 	case PFLAGNUM_4:

-		ret = PF4_AVATARS | PF4_NOCUSTOMAUTH | PF4_NOAUTHDENYREASON | PF4_FORCEADDED |

-			PF4_FORCEAUTH;

+		ret = PF4_AVATARS | PF4_NOCUSTOMAUTH | PF4_NOAUTHDENYREASON | PF4_FORCEAUTH;

 		break;

 

 	case PFLAGNUM_5: /* this is PFLAGNUM_5 change when alpha SDK is released */