From 71cfe74d3618c15feab24032c7d4cd71d77129af Mon Sep 17 00:00:00 2001 From: dartraiden Date: Tue, 7 Apr 2020 22:57:27 +0300 Subject: MSN: moved to deprecated, banned, removed support from plugins, etc --- plugins/FingerprintNG/src/finger_groups.h | 5 ----- plugins/FingerprintNG/src/masks.cpp | 16 ---------------- plugins/FingerprintNG/src/options.cpp | 4 +--- plugins/FingerprintNG/src/resource.h | 12 ------------ plugins/FingerprintNG/src/stdafx.h | 1 - 5 files changed, 1 insertion(+), 37 deletions(-) (limited to 'plugins/FingerprintNG/src') diff --git a/plugins/FingerprintNG/src/finger_groups.h b/plugins/FingerprintNG/src/finger_groups.h index 685fafb1f2..19dbcf4fc9 100644 --- a/plugins/FingerprintNG/src/finger_groups.h +++ b/plugins/FingerprintNG/src/finger_groups.h @@ -38,11 +38,6 @@ case JABBER_CASE: return LPGENW("Client icons") L"/" LPGENW("Jabber clients"); break; -case MSN_CASE: - if (g_plugin.getByte("GroupMSN", 1)) - return LPGENW("Client icons") L"/" LPGENW("MSN clients"); - break; - case RSS_CASE: if (g_plugin.getByte("GroupRSS", 1)) return LPGENW("Client icons") L"/" LPGENW("RSS clients"); diff --git a/plugins/FingerprintNG/src/masks.cpp b/plugins/FingerprintNG/src/masks.cpp index 57830d60d1..7e4be9c495 100644 --- a/plugins/FingerprintNG/src/masks.cpp +++ b/plugins/FingerprintNG/src/masks.cpp @@ -474,21 +474,6 @@ KN_FP_MASK def_kn_fp_mask[] = { "client_IRCUnknown", L"*IRC*", L"Unknown IRC client", IDI_IRC, IRC_CASE, TRUE }, - //######################################################################################################################################################################### - //################################# MSN ############################################################################################################################### - //######################################################################################################################################################################### - { "client_WLM11", L"WLM*2011*", L"Windows Live 11", IDI_WLM_10, MSN_CASE, TRUE }, - { "client_WLM10", L"WLM*2010*", L"Windows Live 10", IDI_WLM_10, MSN_CASE, TRUE }, - { "client_WLM9", L"WLM*9*", L"Windows Live v9.x", IDI_WLM_9, MSN_CASE, TRUE }, - { "client_MSN8", L"|WLM*8.*|MSN*8.*", L"Windows Live v8.x", IDI_MSN_8, MSN_CASE, TRUE }, - { "client_MSN7x", L"MSN*7.*", L"MSN Messenger v7.x", IDI_MSN_7, MSN_CASE, TRUE }, - { "client_MSN6x", L"MSN*6.*", L"MSN Messenger v6.x", IDI_MSN_6, MSN_CASE, TRUE }, - { "client_MSN45", L"MSN*4.x-5.x", L"MSN Messenger v4.x-5.x", IDI_MSN_45, MSN_CASE, TRUE }, - { "client_MSN4Mac", L"MSN*Mac*", L"MSN for Mac", IDI_MSN_MAC, MSN_CASE, TRUE }, - { "client_aMSN", L"*aMSN*", L"aMSN", IDI_AMSN, MSN_CASE, TRUE }, - { "client_MSN_Web", L"WebMessenger*", L"WebMessenger", IDI_WEBMESSENGER, MSN_CASE, TRUE }, - { "client_MSN", L"|WLM*|MSN*|Windows Live*", L"MSN", IDI_MSN, MSN_CASE, TRUE }, - //######################################################################################################################################################################### //################################# WEATHER ########################################################################################################################### //######################################################################################################################################################################### @@ -628,7 +613,6 @@ KN_FP_MASK def_kn_fp_overlays_mask[] = { "client_JGmail_overlay", L"*JGmail*", LPGENW("JGmail overlay"), IDI_GMAIL_OVERLAY, OVERLAYS_PROTO_CASE }, { "client_JGTalk_overlay", L"*JGTalk*", LPGENW("JGTalk overlay"), IDI_JGTALK_OVERLAY, OVERLAYS_PROTO_CASE }, { "client_Jabber_overlay", L"|^jabber*|Miranda*Jabber*|py*jabb*", LPGENW("Jabber overlay"), IDI_JABBER_OVERLAY, OVERLAYS_PROTO_CASE }, - { "client_MSN_overlay", L"|^MSN*|*Miranda*MSN*", LPGENW("MSN overlay"), IDI_MSN_OVERLAY, OVERLAYS_PROTO_CASE }, { "client_VK_overlay", L"|Miranda*VKontakte*", LPGENW("VK overlay"), IDI_VK_OVERLAY, OVERLAYS_PROTO_CASE }, { "client_Skype_overlay", L"|Miranda*Skype*", LPGENW("Skype overlay"), IDI_SKYPE_OVERLAY, OVERLAYS_PROTO_CASE }, diff --git a/plugins/FingerprintNG/src/options.cpp b/plugins/FingerprintNG/src/options.cpp index 9344497aa2..c1e5f780e7 100644 --- a/plugins/FingerprintNG/src/options.cpp +++ b/plugins/FingerprintNG/src/options.cpp @@ -37,7 +37,6 @@ static settings[] = { IDC_GROUP_ICQ, TRUE, "GroupICQ" }, { IDC_GROUP_IRC, TRUE, "GroupIRC" }, { IDC_GROUP_JABBER, TRUE, "GroupJabber" }, - { IDC_GROUP_MSN, TRUE, "GroupMSN" }, { IDC_GROUP_RSS, TRUE, "GroupRSS" }, { IDC_GROUP_WEATHER, TRUE, "GroupWeather" }, { IDC_GROUP_FACEBOOK, TRUE, "GroupFacebook" }, @@ -57,7 +56,7 @@ static settings[] = class COptDialog : public CDlgBase { CCtrlCheck m_chkMiranda, m_chkMirandaPacks, m_chkMirandaVer, m_chkOverRes, m_chkOverPlatf, m_chkOverProto, m_chkOverUnicode, m_chkOverSecur, - m_chkFacebbok, m_chkGG, m_chkICQ, m_chkIRC, m_chkJabber, m_chkMSN, m_chkRSS, m_chkVK, m_chkWeather, m_chkMulti, m_chkOthersProto, + m_chkFacebbok, m_chkGG, m_chkICQ, m_chkIRC, m_chkJabber, m_chkRSS, m_chkVK, m_chkWeather, m_chkMulti, m_chkOthersProto, m_chkOthers, m_chkStatusBar; void LoadDBCheckState(int idCtrl, LPCSTR szSetting, BYTE bDef) @@ -88,7 +87,6 @@ public: m_chkICQ(this, IDC_GROUP_ICQ), m_chkIRC(this, IDC_GROUP_IRC), m_chkJabber(this, IDC_GROUP_JABBER), - m_chkMSN(this, IDC_GROUP_MSN), m_chkRSS(this, IDC_GROUP_RSS), m_chkVK(this, IDC_GROUP_VK), m_chkWeather(this, IDC_GROUP_WEATHER), diff --git a/plugins/FingerprintNG/src/resource.h b/plugins/FingerprintNG/src/resource.h index a709145cb9..95787aa7b5 100644 --- a/plugins/FingerprintNG/src/resource.h +++ b/plugins/FingerprintNG/src/resource.h @@ -59,7 +59,6 @@ #define IDI_IRC_OVERLAY 82 #define IDI_JABBER_OVERLAY 83 #define IDI_JGTALK_OVERLAY 84 -#define IDI_MSN_OVERLAY 86 #define IDI_VK_OVERLAY 90 #define IDI_SKYPE_OVERLAY 91 #define IDI_SECUREIM_OVERLAY 95 @@ -380,16 +379,6 @@ #define IDI_GG9_OVERLAY 726 #define IDI_GG10_OVERLAY 727 #define IDI_GG11_OVERLAY 728 -#define IDI_AMSN 741 -#define IDI_MSN_MAC 742 -#define IDI_MSN_45 743 -#define IDI_MSN_6 744 -#define IDI_MSN_7 745 -#define IDI_MSN_8 746 -#define IDI_MSN 747 -#define IDI_WEBMESSENGER 748 -#define IDI_WLM_9 749 -#define IDI_WLM_10 750 #define IDI_ATOM1 761 #define IDI_ATOM3 762 #define IDI_RSS09 763 @@ -523,7 +512,6 @@ #define IDC_GROUP_ICQ 10032 #define IDC_GROUP_IRC 10033 #define IDC_GROUP_JABBER 10034 -#define IDC_GROUP_MSN 10035 #define IDC_GROUP_RSS 10038 #define IDC_GROUP_WEATHER 10040 #define IDC_GROUP_FACEBOOK 10042 diff --git a/plugins/FingerprintNG/src/stdafx.h b/plugins/FingerprintNG/src/stdafx.h index ae7d2dfdd4..a41b4c7a0a 100644 --- a/plugins/FingerprintNG/src/stdafx.h +++ b/plugins/FingerprintNG/src/stdafx.h @@ -82,7 +82,6 @@ struct FOUNDINFO #define ICQ_CASE 3008 // ICQ clients #define IRC_CASE 3009 // IRC clients #define JABBER_CASE 3010 // Jabber clients -#define MSN_CASE 3012 // MSN clients #define RSS_CASE 3014 // RSS clients #define WEATHER_CASE 3016 // Weather clients #define FACEBOOK_CASE 3018 // Facebook clients -- cgit v1.2.3