diff options
24 files changed, 18 insertions, 74 deletions
diff --git a/include/delphi/m_protosvc.inc b/include/delphi/m_protosvc.inc index d0a341f57f..8edc1b645d 100644 --- a/include/delphi/m_protosvc.inc +++ b/include/delphi/m_protosvc.inc @@ -77,7 +77,6 @@ const PF1_MODEMSG = (PF1_MODEMSGSEND or PF1_MODEMSGRECV);
PF1_SERVERCLIST = $00000100; // contact lists are stored on the server, not locally. See notes below
PF1_AUTHREQ = $00000200; // will get authorisation requests for some or all contacts
- PF1_ADDED = $00000400; // will get 'you were added' notifications
PF1_VISLIST = $00000800; // has an invisible list
PF1_INVISLIST = $00001000; // has a visible list for when in invisible mode
PF1_INDIVSTATUS = $00002000; // supports setting different status modes to each contact
@@ -118,7 +117,6 @@ const PFLAGNUM_4 = 4; // v0.3+: flag asking a protocol plugin how auths are handled
PF4_FORCEAUTH = $00000001; // protocol has to send auth's for things to work
- PF4_FORCEADDED = $00000002; // protocol has to tell people that they were added (otherwise things don't work)
PF4_NOCUSTOMAUTH = $00000004; // protocol can't send a custom message while asking others for auth
PF4_SUPPORTTYPING = $00000008; // protocol supports user is typing messages v0.3.3+
PF4_SUPPORTIDLE = $00000010; // protocol understands idle, added during v0.3.4+ (2004/09/13)
diff --git a/include/m_protosvc.h b/include/m_protosvc.h index 4d5b0c5de4..7e0daf7f83 100644 --- a/include/m_protosvc.h +++ b/include/m_protosvc.h @@ -58,7 +58,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define PF1_MODEMSGRECV 0x00000080 // supports reading others' away messages
#define PF1_SERVERCLIST 0x00000100 // contact lists are stored on the server, not locally. See notes below
#define PF1_AUTHREQ 0x00000200 // will get authorisation requests for some or all contacts
-#define PF1_ADDED 0x00000400 // will get 'you were added' notifications
#define PF1_VISLIST 0x00000800 // has an invisible list
#define PF1_INVISLIST 0x00001000 // has a visible list for when in invisible mode
#define PF1_INDIVSTATUS 0x00002000 // supports setting different status modes to each contact
@@ -137,7 +136,6 @@ static __inline unsigned long Proto_Status2Flag(int status) #define PFLAGNUM_4 4
#define PF4_FORCEAUTH 0x00000001 // forces auth requests to be sent when adding users
-#define PF4_FORCEADDED 0x00000002 // forces "you were added" requests to be sent
#define PF4_NOCUSTOMAUTH 0x00000004 // protocol doesn't support custom auth text (doesn't show auth text box)
#define PF4_SUPPORTTYPING 0x00000008 // protocol supports user is typing messages
#define PF4_SUPPORTIDLE 0x00000010 // protocol understands idle
@@ -301,13 +299,6 @@ static __inline unsigned long Proto_Status2Flag(int status) #define PS_AUTHDENY "/AuthDeny"
///////////////////////////////////////////////////////////////////////////////
-// Send a "You were added" event
-// wParam = lParam = 0
-// Returns 0 on success, nonzero on failure
-
-#define PSS_ADDED "/YouWereAdded"
-
-///////////////////////////////////////////////////////////////////////////////
// Create account manager UI form
// wParam = 0
// lParam = (LPARAM)(HWND)hwndAccMgr
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 */
diff --git a/protocols/Discord/src/proto.cpp b/protocols/Discord/src/proto.cpp index b95b393c62..a26384ab7a 100644 --- a/protocols/Discord/src/proto.cpp +++ b/protocols/Discord/src/proto.cpp @@ -152,7 +152,7 @@ INT_PTR CDiscordProto::GetCaps(int type, MCONTACT) case PFLAGNUM_3: return PF2_ONLINE | PF2_LONGAWAY | PF2_HEAVYDND | PF2_INVISIBLE; case PFLAGNUM_4: - return PF4_FORCEADDED | PF4_FORCEAUTH | PF4_NOCUSTOMAUTH | PF4_NOAUTHDENYREASON | PF4_SUPPORTTYPING | PF4_SUPPORTIDLE | PF4_AVATARS | PF4_IMSENDOFFLINE | PF4_SERVERMSGID; + return PF4_FORCEAUTH | PF4_NOCUSTOMAUTH | PF4_NOAUTHDENYREASON | PF4_SUPPORTTYPING | PF4_SUPPORTIDLE | PF4_AVATARS | PF4_IMSENDOFFLINE | PF4_SERVERMSGID; case PFLAG_UNIQUEIDTEXT: return (INT_PTR)Translate("User ID"); } diff --git a/protocols/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp index 1f265f2d0c..8d10c2bab3 100644 --- a/protocols/FacebookRM/src/proto.cpp +++ b/protocols/FacebookRM/src/proto.cpp @@ -128,7 +128,7 @@ INT_PTR FacebookProto::GetCaps(int type, MCONTACT) switch (type) { case PFLAGNUM_1: { - DWORD_PTR flags = PF1_IM | PF1_CHAT | PF1_SERVERCLIST | PF1_AUTHREQ | /*PF1_ADDED |*/ PF1_BASICSEARCH | PF1_SEARCHBYEMAIL | PF1_SEARCHBYNAME | PF1_ADDSEARCHRES; // | PF1_VISLIST | PF1_INVISLIST; + DWORD_PTR flags = PF1_IM | PF1_CHAT | PF1_SERVERCLIST | PF1_AUTHREQ | PF1_BASICSEARCH | PF1_SEARCHBYEMAIL | PF1_SEARCHBYNAME | PF1_ADDSEARCHRES; if (getByte(FACEBOOK_KEY_SET_MIRANDA_STATUS)) return flags |= PF1_MODEMSG; @@ -143,7 +143,7 @@ INT_PTR FacebookProto::GetCaps(int type, MCONTACT) else return 0; case PFLAGNUM_4: - return PF4_NOCUSTOMAUTH | PF4_FORCEADDED | PF4_AVATARS | PF4_SUPPORTTYPING | PF4_NOAUTHDENYREASON | PF4_IMSENDOFFLINE | PF4_READNOTIFY; + return PF4_NOCUSTOMAUTH | PF4_AVATARS | PF4_SUPPORTTYPING | PF4_NOAUTHDENYREASON | PF4_IMSENDOFFLINE | PF4_READNOTIFY; case PFLAGNUM_5: return PF2_ONTHEPHONE; case PFLAG_MAXLENOFMESSAGE: diff --git a/protocols/ICQCorp/src/services.cpp b/protocols/ICQCorp/src/services.cpp index 7b81bc5671..850bb8173f 100644 --- a/protocols/ICQCorp/src/services.cpp +++ b/protocols/ICQCorp/src/services.cpp @@ -25,7 +25,7 @@ static INT_PTR icqGetCaps(WPARAM wParam, LPARAM) {
switch (wParam) {
case PFLAGNUM_1:
- return PF1_IM | PF1_URL | PF1_FILE | PF1_MODEMSG | PF1_AUTHREQ | PF1_ADDED | PF1_PEER2PEER | PF1_BASICSEARCH | PF1_EXTSEARCH | PF1_CANRENAMEFILE | PF1_FILERESUME | PF1_ADDSEARCHRES | PF1_SEARCHBYEMAIL | PF1_SEARCHBYNAME | PF1_NUMERICUSERID;
+ return PF1_IM | PF1_URL | PF1_FILE | PF1_MODEMSG | PF1_AUTHREQ | PF1_PEER2PEER | PF1_BASICSEARCH | PF1_EXTSEARCH | PF1_CANRENAMEFILE | PF1_FILERESUME | PF1_ADDSEARCHRES | PF1_SEARCHBYEMAIL | PF1_SEARCHBYNAME | PF1_NUMERICUSERID;
case PFLAGNUM_2:
return PF2_ONLINE | PF2_INVISIBLE | PF2_SHORTAWAY | PF2_LONGAWAY | PF2_LIGHTDND | PF2_HEAVYDND | PF2_FREECHAT;
diff --git a/protocols/Icq10/src/proto.cpp b/protocols/Icq10/src/proto.cpp index cf9a226bb0..c039dd4585 100644 --- a/protocols/Icq10/src/proto.cpp +++ b/protocols/Icq10/src/proto.cpp @@ -203,10 +203,9 @@ INT_PTR CIcqProto::GetCaps(int type, MCONTACT hContact) INT_PTR nReturn = 0; switch (type) { - case PFLAGNUM_1: nReturn = PF1_IM | PF1_URL | PF1_AUTHREQ | PF1_BASICSEARCH | PF1_ADDSEARCHRES | /*PF1_SEARCHBYNAME | TODO */ - PF1_VISLIST | PF1_INVISLIST | PF1_MODEMSG | PF1_FILE | PF1_ADDED | PF1_CONTACT | PF1_SERVERCLIST; + PF1_VISLIST | PF1_INVISLIST | PF1_MODEMSG | PF1_FILE | PF1_CONTACT | PF1_SERVERCLIST; break; case PFLAGNUM_2: @@ -216,7 +215,7 @@ INT_PTR CIcqProto::GetCaps(int type, MCONTACT hContact) return PF2_ONLINE | PF2_SHORTAWAY | PF2_LONGAWAY | PF2_LIGHTDND | PF2_HEAVYDND | PF2_FREECHAT | PF2_INVISIBLE; case PFLAGNUM_4: - nReturn = PF4_SUPPORTIDLE | PF4_IMSENDOFFLINE | PF4_INFOSETTINGSVC | PF4_SUPPORTTYPING | PF4_AVATARS | PF4_SERVERMSGID; + nReturn = PF4_FORCEAUTH | PF4_SUPPORTIDLE | PF4_IMSENDOFFLINE | PF4_INFOSETTINGSVC | PF4_SUPPORTTYPING | PF4_AVATARS | PF4_SERVERMSGID; break; case PFLAGNUM_5: diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp index 68dde9068a..5b4eeef4c3 100755 --- a/protocols/JabberG/src/jabber_proto.cpp +++ b/protocols/JabberG/src/jabber_proto.cpp @@ -594,7 +594,7 @@ INT_PTR CJabberProto::GetCaps(int type, MCONTACT hContact) case PFLAGNUM_3:
return PF2_ONLINE | PF2_SHORTAWAY | PF2_LONGAWAY | PF2_HEAVYDND | PF2_FREECHAT;
case PFLAGNUM_4:
- return PF4_FORCEAUTH | PF4_NOCUSTOMAUTH | PF4_NOAUTHDENYREASON | PF4_SUPPORTTYPING | PF4_AVATARS | PF4_FORCEADDED;
+ return PF4_FORCEAUTH | PF4_NOCUSTOMAUTH | PF4_NOAUTHDENYREASON | PF4_SUPPORTTYPING | PF4_AVATARS;
case PFLAG_UNIQUEIDTEXT:
return (INT_PTR)Translate("JID");
case PFLAG_MAXCONTACTSPERPACKET:
diff --git a/protocols/MSN/src/msn_proto.cpp b/protocols/MSN/src/msn_proto.cpp index 4cc2b1fae4..1d783d9760 100644 --- a/protocols/MSN/src/msn_proto.cpp +++ b/protocols/MSN/src/msn_proto.cpp @@ -661,7 +661,7 @@ INT_PTR CMsnProto::GetCaps(int type, MCONTACT) return PF2_ONLINE | PF2_SHORTAWAY | PF2_LIGHTDND;
case PFLAGNUM_4:
- return PF4_FORCEAUTH | PF4_FORCEADDED | PF4_SUPPORTTYPING | PF4_AVATARS | PF4_SUPPORTIDLE | PF4_IMSENDOFFLINE | PF4_NOAUTHDENYREASON;
+ return PF4_FORCEAUTH | PF4_SUPPORTTYPING | PF4_AVATARS | PF4_SUPPORTIDLE | PF4_IMSENDOFFLINE | PF4_NOAUTHDENYREASON;
case PFLAGNUM_5:
return PF2_ONTHEPHONE;
diff --git a/protocols/SkypeWeb/src/skype_proto.cpp b/protocols/SkypeWeb/src/skype_proto.cpp index 48046fa198..a2e5d9fbcf 100644 --- a/protocols/SkypeWeb/src/skype_proto.cpp +++ b/protocols/SkypeWeb/src/skype_proto.cpp @@ -117,7 +117,7 @@ INT_PTR CSkypeProto::GetCaps(int type, MCONTACT) case PFLAGNUM_3: return PF2_ONLINE | PF2_INVISIBLE | PF2_SHORTAWAY | PF2_HEAVYDND; case PFLAGNUM_4: - return PF4_FORCEADDED | PF4_NOAUTHDENYREASON | PF4_SUPPORTTYPING | PF4_AVATARS | PF4_IMSENDOFFLINE | PF4_OFFLINEFILES | PF4_SERVERMSGID; + return PF4_NOAUTHDENYREASON | PF4_SUPPORTTYPING | PF4_AVATARS | PF4_IMSENDOFFLINE | PF4_OFFLINEFILES | PF4_SERVERMSGID; case PFLAG_UNIQUEIDTEXT: return (INT_PTR)Translate("Skypename"); } diff --git a/protocols/Steam/src/steam_proto.cpp b/protocols/Steam/src/steam_proto.cpp index c64bba1620..67cca4f27e 100644 --- a/protocols/Steam/src/steam_proto.cpp +++ b/protocols/Steam/src/steam_proto.cpp @@ -198,7 +198,7 @@ INT_PTR CSteamProto::GetCaps(int type, MCONTACT) case PFLAGNUM_2: return PF2_ONLINE | PF2_SHORTAWAY | PF2_LONGAWAY | PF2_HEAVYDND | PF2_OUTTOLUNCH | PF2_FREECHAT; case PFLAGNUM_4: - return PF4_AVATARS | PF4_NOCUSTOMAUTH | PF4_NOAUTHDENYREASON | PF4_FORCEAUTH | PF4_FORCEADDED | PF4_SUPPORTIDLE | PF4_SUPPORTTYPING;// | PF4_IMSENDOFFLINE; + return PF4_AVATARS | PF4_NOCUSTOMAUTH | PF4_NOAUTHDENYREASON | PF4_FORCEAUTH | PF4_SUPPORTIDLE | PF4_SUPPORTTYPING;// | PF4_IMSENDOFFLINE; case PFLAGNUM_5: return PF2_HEAVYDND | PF2_OUTTOLUNCH | PF2_FREECHAT; case PFLAG_UNIQUEIDTEXT: diff --git a/protocols/Tox/src/tox_proto.cpp b/protocols/Tox/src/tox_proto.cpp index 7c40c86769..d46a26de5e 100644 --- a/protocols/Tox/src/tox_proto.cpp +++ b/protocols/Tox/src/tox_proto.cpp @@ -68,7 +68,7 @@ INT_PTR CToxProto::GetCaps(int type, MCONTACT) case PFLAGNUM_3:
return PF2_ONLINE | PF2_SHORTAWAY | PF2_LIGHTDND;
case PFLAGNUM_4:
- return PF4_SINGLEFILEONLY | PF4_SUPPORTTYPING | PF4_AVATARS | PF4_FORCEADDED | PF4_NOAUTHDENYREASON | PF4_FORCEAUTH;
+ return PF4_SINGLEFILEONLY | PF4_SUPPORTTYPING | PF4_AVATARS | PF4_NOAUTHDENYREASON | PF4_FORCEAUTH;
case PFLAG_UNIQUEIDTEXT:
return (INT_PTR)"Tox ID";
case PFLAG_MAXLENOFMESSAGE:
diff --git a/src/mir_app/res/resource.rc b/src/mir_app/res/resource.rc index 5cc29b0ed6..bddc200d59 100644 --- a/src/mir_app/res/resource.rc +++ b/src/mir_app/res/resource.rc @@ -50,9 +50,8 @@ BEGIN PUSHBUTTON "&Cancel",IDCANCEL,139,135,71,14
EDITTEXT IDC_MYHANDLE,6,16,90,12,ES_AUTOHSCROLL
COMBOBOX IDC_GROUP,112,16,110,60,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
- CONTROL "Send ""You were added""",IDC_ADDED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,44,204,10
- CONTROL "Send authorization request",IDC_AUTH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,56,204,10
- CONTROL "Open contact's chat window",IDC_OPEN_WINDOW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,68,204,10
+ CONTROL "Send authorization request",IDC_AUTH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,44,204,10
+ CONTROL "Open contact's chat window",IDC_OPEN_WINDOW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,56,204,10
LTEXT "Custom name:",IDC_STATIC,6,4,70,10
LTEXT "Group:",IDC_STATIC,112,4,70,10
GROUPBOX "Options",IDC_STATIC,7,33,216,48
@@ -295,8 +294,6 @@ BEGIN CTEXT "Only the ticked contacts will be shown on the main contact list",IDC_STCHECKMARKS,8,227,297,8
CONTROL "",IDC_LIST,"CListControl",WS_TABSTOP | 0x3da,8,26,297,146,WS_EX_CLIENTEDGE
GROUPBOX "Ignore",IDC_STATIC,0,0,313,240
- ICON IDI_ADDCONTACT,IDC_ADDED,96,202,20,20,SS_CENTERIMAGE
- LTEXT "Added notification",IDC_STATIC,116,208,107,8,SS_NOPREFIX | SS_CENTERIMAGE
ICON IDI_TYPING,IDC_TYPINGICON,221,172,20,20,SS_CENTERIMAGE
LTEXT "Typing",IDC_STATIC,241,178,66,8,SS_NOPREFIX | SS_CENTERIMAGE
END
diff --git a/src/mir_app/src/addcontact.cpp b/src/mir_app/src/addcontact.cpp index 500aa2cae3..db2794f059 100644 --- a/src/mir_app/src/addcontact.cpp +++ b/src/mir_app/src/addcontact.cpp @@ -38,7 +38,7 @@ static wchar_t* sttDecodeString(DWORD dwFlags, MAllStrings &src) class CAddContactDlg : public CDlgBase
{
CCtrlEdit m_authReq, m_myHandle;
- CCtrlCheck m_chkAdded, m_chkAuth, m_chkOpen;
+ CCtrlCheck m_chkAuth, m_chkOpen;
CCtrlButton m_btnOk;
CCtrlCombo m_group;
@@ -52,7 +52,6 @@ protected: public:
CAddContactDlg() :
CDlgBase(g_plugin, IDD_ADDCONTACT),
- m_chkAdded(this, IDC_ADDED),
m_chkAuth(this, IDC_AUTH),
m_chkOpen(this, IDC_OPEN_WINDOW),
m_btnOk(this, IDOK),
@@ -87,7 +86,6 @@ public: m_group.SetCurSel(groupSel);
// By default check both checkboxes
- m_chkAdded.SetState(true);
m_chkAuth.SetState(true);
// Set last choice
@@ -95,9 +93,6 @@ public: m_chkOpen.SetState(true);
DWORD flags = (m_szProto) ? CallProtoServiceInt(0, m_szProto, PS_GETCAPS, PFLAGNUM_4, 0) : 0;
- if (flags & PF4_FORCEADDED) // force you were added requests for this protocol
- m_chkAdded.Enable(false);
-
if (flags & PF4_FORCEAUTH) // force auth requests for this protocol
m_chkAuth.Enable(false);
@@ -153,9 +148,6 @@ public: db_unset(hContact, "CList", "NotOnList");
- if (m_chkAdded.GetState())
- ProtoChainSend(hContact, PSS_ADDED, 0, 0);
-
if (m_chkAuth.GetState()) {
DWORD flags = CallProtoServiceInt(0, m_szProto, PS_GETCAPS, PFLAGNUM_4, 0);
if (flags & PF4_NOCUSTOMAUTH)
diff --git a/src/mir_app/src/ignore.cpp b/src/mir_app/src/ignore.cpp index e217fa5325..42b728a9aa 100644 --- a/src/mir_app/src/ignore.cpp +++ b/src/mir_app/src/ignore.cpp @@ -222,7 +222,6 @@ static INT_PTR CALLBACK DlgProcIgnoreOpts(HWND hwndDlg, UINT msg, WPARAM, LPARAM SendDlgItemMessage(hwndDlg, IDC_FILEICON, STM_SETICON, (WPARAM)hIcons[4], 0);
SendDlgItemMessage(hwndDlg, IDC_ONLINEICON, STM_SETICON, (WPARAM)hIcons[5], 0);
SendDlgItemMessage(hwndDlg, IDC_AUTHICON, STM_SETICON, (WPARAM)hIcons[6], 0);
- SendDlgItemMessage(hwndDlg, IDC_ADDED, STM_SETICON, (WPARAM)hIcons[7], 0);
SendDlgItemMessage(hwndDlg, IDC_TYPINGICON, STM_SETICON, (WPARAM)hIcons[8], 0);
ResetListOptions(GetDlgItem(hwndDlg, IDC_LIST));
diff --git a/src/mir_app/src/resource.h b/src/mir_app/src/resource.h index 3900899fbd..712484569a 100644 --- a/src/mir_app/src/resource.h +++ b/src/mir_app/src/resource.h @@ -463,7 +463,6 @@ #define IDC_TOPLINE 1535
#define IDC_MYHANDLE 1540
#define IDC_GROUP 1541
-#define IDC_ADDED 1542
#define IDC_AUTH 1543
#define IDC_OPEN_WINDOW 1544
#define IDC_DELETEHISTORY 1560
|