From a54b99a40847da462920bcbe8c2e765af5edf1b3 Mon Sep 17 00:00:00 2001 From: dartraiden Date: Wed, 6 Feb 2019 00:19:31 +0300 Subject: Fingerprint: remove dead ICQ clients --- plugins/FingerprintNG/iconpacks/res/ICQ/QIP.ico | Bin 1150 -> 0 bytes .../FingerprintNG/iconpacks/res/ICQ/overlay_ICQ_v3.ico | Bin 1150 -> 0 bytes .../FingerprintNG/iconpacks/res/ICQ/overlay_ICQ_v4.ico | Bin 1150 -> 0 bytes .../FingerprintNG/iconpacks/res/ICQ/overlay_ICQ_v5.ico | Bin 1150 -> 0 bytes .../FingerprintNG/iconpacks/res/ICQ/overlay_ICQ_v6.ico | Bin 1150 -> 0 bytes .../FingerprintNG/iconpacks/res/ICQ/overlay_ICQ_v7.ico | Bin 1150 -> 0 bytes .../iconpacks/res/Overlays/overlay_proto_ICQJ_Plus.ico | Bin 1150 -> 0 bytes plugins/FingerprintNG/iconpacks/res/fp_icons.rc | 7 ------- plugins/FingerprintNG/src/masks.cpp | 9 +-------- plugins/FingerprintNG/src/resource.h | 7 ------- 10 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 plugins/FingerprintNG/iconpacks/res/ICQ/QIP.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/ICQ/overlay_ICQ_v3.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/ICQ/overlay_ICQ_v4.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/ICQ/overlay_ICQ_v5.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/ICQ/overlay_ICQ_v6.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/ICQ/overlay_ICQ_v7.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_ICQJ_Plus.ico (limited to 'plugins/FingerprintNG') diff --git a/plugins/FingerprintNG/iconpacks/res/ICQ/QIP.ico b/plugins/FingerprintNG/iconpacks/res/ICQ/QIP.ico deleted file mode 100644 index f282401d9c..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/ICQ/QIP.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/ICQ/overlay_ICQ_v3.ico b/plugins/FingerprintNG/iconpacks/res/ICQ/overlay_ICQ_v3.ico deleted file mode 100644 index 5c67afdf52..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/ICQ/overlay_ICQ_v3.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/ICQ/overlay_ICQ_v4.ico b/plugins/FingerprintNG/iconpacks/res/ICQ/overlay_ICQ_v4.ico deleted file mode 100644 index c777eb8f89..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/ICQ/overlay_ICQ_v4.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/ICQ/overlay_ICQ_v5.ico b/plugins/FingerprintNG/iconpacks/res/ICQ/overlay_ICQ_v5.ico deleted file mode 100644 index 17492448ba..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/ICQ/overlay_ICQ_v5.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/ICQ/overlay_ICQ_v6.ico b/plugins/FingerprintNG/iconpacks/res/ICQ/overlay_ICQ_v6.ico deleted file mode 100644 index 526a51fb41..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/ICQ/overlay_ICQ_v6.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/ICQ/overlay_ICQ_v7.ico b/plugins/FingerprintNG/iconpacks/res/ICQ/overlay_ICQ_v7.ico deleted file mode 100644 index 4966ba3b1d..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/ICQ/overlay_ICQ_v7.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_ICQJ_Plus.ico b/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_ICQJ_Plus.ico deleted file mode 100644 index 75b38aeb54..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_ICQJ_Plus.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/fp_icons.rc b/plugins/FingerprintNG/iconpacks/res/fp_icons.rc index 079622dd68..62377e53d5 100644 --- a/plugins/FingerprintNG/iconpacks/res/fp_icons.rc +++ b/plugins/FingerprintNG/iconpacks/res/fp_icons.rc @@ -382,18 +382,12 @@ IDI_JIMM ICON "ICQ\\Jimm.ico" IDI_LIBICQ2000 ICON "ICQ\\LibICQ2000.ico" IDI_LICQ ICON "ICQ\\Licq.ico" IDI_LOCID ICON "ICQ\\locid.ico" -IDI_QIP_2005 ICON "ICQ\\QIP.ico" IDI_RANDQ ICON "ICQ\\R&Q.ico" IDI_SMARTICQ ICON "ICQ\\SmartICQ.ico" IDI_SPAM ICON "ICQ\\spam.ico" IDI_STRICQ ICON "ICQ\\StrICQ.ico" IDI_TICQ ICON "ICQ\\TICQClient.ico" IDI_ICQ ICON "ICQ\\ICQ.ico" -IDI_ICQ3_OVERLAY ICON "ICQ\\overlay_ICQ_v3.ico" -IDI_ICQ4_OVERLAY ICON "ICQ\\overlay_ICQ_v4.ico" -IDI_ICQ5_OVERLAY ICON "ICQ\\overlay_ICQ_v5.ico" -IDI_ICQ6_OVERLAY ICON "ICQ\\overlay_ICQ_v6.ico" -IDI_ICQ7_OVERLAY ICON "ICQ\\overlay_ICQ_v7.ico" IDI_ICQ8_OVERLAY ICON "ICQ\\overlay_ICQ_v8.ico" IDI_AMIRC ICON "IRC\\AmIRC.ico" IDI_AMULE ICON "IRC\\aMule.ico" @@ -528,7 +522,6 @@ IDI_WHATSAPP ICON "others\\WhatsApp.ico" IDI_STEAM ICON "others\\Steam.ico" IDI_GMAIL_OVERLAY ICON "overlays\\overlay_proto_Gmail.ico" IDI_ICQJ_OVERLAY ICON "overlays\\overlay_proto_ICQJ.ico" -IDI_ICQJ_PLUS_OVERLAY ICON "overlays\\overlay_proto_ICQJ_Plus.ico" IDI_IRC_OVERLAY ICON "overlays\\overlay_proto_IRC.ico" IDI_JABBER_OVERLAY ICON "overlays\\overlay_proto_Jabber.ico" IDI_JGTALK_OVERLAY ICON "overlays\\overlay_proto_JGTalk.ico" diff --git a/plugins/FingerprintNG/src/masks.cpp b/plugins/FingerprintNG/src/masks.cpp index 9b5abd4baa..0cdf5d7121 100644 --- a/plugins/FingerprintNG/src/masks.cpp +++ b/plugins/FingerprintNG/src/masks.cpp @@ -198,7 +198,6 @@ KN_FP_MASK def_kn_fp_mask[] = { "client_Jimm", L"|*Jimm*|mobicq*", L"Jimm", IDI_JIMM, ICQ_CASE, TRUE }, { "client_Licq", L"Licq*", L"Licq", IDI_LICQ, ICQ_CASE, TRUE }, { "client_LocID", L"LocID*", L"LocID", IDI_LOCID, ICQ_CASE, TRUE }, - { "client_QIP_2005", L"QIP*2005*", L"QIP 2005", IDI_QIP_2005, ICQ_CASE, TRUE }, { "client_R&Q", L"|R&Q*|&RQ*", L"R&Q", IDI_RANDQ, ICQ_CASE, TRUE }, { "client_SmartICQ", L"Smart*ICQ*", L"SmartICQ", IDI_SMARTICQ, ICQ_CASE, TRUE }, { "client_StrICQ", L"StrICQ*", L"StrICQ", IDI_STRICQ, ICQ_CASE, TRUE }, @@ -649,8 +648,7 @@ KN_FP_MASK def_kn_fp_overlays_mask[] = //######################################################################################################################################################################### //################################# PROTO OVERLAYS #################################################################################################################### //######################################################################################################################################################################### - { "client_ICQJ_Plus_over", L"*ICQ*Plus*", LPGENW("ICQJ Plus Mod overlay"), IDI_ICQJ_PLUS_OVERLAY, OVERLAYS_PROTO_CASE }, - { "client_ICQJ_overlay", L"|^ICQ|^ICQ*|*ICQ*|MRA client", LPGENW("ICQJ overlay"), IDI_ICQJ_OVERLAY, OVERLAYS_PROTO_CASE }, + { "client_ICQJ_overlay", L"|^ICQ|^ICQ*|*ICQ*", LPGENW("ICQJ overlay"), IDI_ICQJ_OVERLAY, OVERLAYS_PROTO_CASE }, { "client_IRC_overlay", L"|^IRC*|Miranda*IRC*", LPGENW("IRC overlay"), IDI_IRC_OVERLAY, OVERLAYS_PROTO_CASE }, { "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 }, @@ -663,11 +661,6 @@ KN_FP_MASK def_kn_fp_overlays_mask[] = //######################################################################################################################################################################### //################################# CLIENT VERSION OVERLAYS ########################################################################################################### //######################################################################################################################################################################### - { "client_ICQ3_over", L"ICQ*2003*", LPGENW("ICQ 2003 overlay"), IDI_ICQ3_OVERLAY, ICQ_CASE }, - { "client_ICQ4_over", L"|ICQ*4*|ICQ*lite*4*", LPGENW("ICQ Lite 4 overlay"), IDI_ICQ4_OVERLAY, ICQ_CASE }, - { "client_ICQ5_over", L"|ICQ*5*|ICQ*lite*5*|icq5*", LPGENW("ICQ v5.x overlay"), IDI_ICQ5_OVERLAY, ICQ_CASE }, - { "client_ICQ6_over", L"ICQ*6*", LPGENW("ICQ v6.x overlay"), IDI_ICQ6_OVERLAY, ICQ_CASE }, - { "client_ICQ7_over", L"ICQ*7*", LPGENW("ICQ v7.x overlay"), IDI_ICQ7_OVERLAY, ICQ_CASE }, { "client_ICQ8_over", L"ICQ*8*", LPGENW("ICQ v8.x overlay"), IDI_ICQ8_OVERLAY, ICQ_CASE }, { "client_GG_11", L"|Gadu-Gadu*11*|GG*11*", LPGENW("Gadu-Gadu v11 client"), IDI_GG11_OVERLAY, GG_CASE }, diff --git a/plugins/FingerprintNG/src/resource.h b/plugins/FingerprintNG/src/resource.h index 3f77658cb8..31c9d3cfe8 100644 --- a/plugins/FingerprintNG/src/resource.h +++ b/plugins/FingerprintNG/src/resource.h @@ -56,7 +56,6 @@ #define IDI_PLATFORM_X64 77 #define IDI_GMAIL_OVERLAY 79 #define IDI_ICQJ_OVERLAY 80 -#define IDI_ICQJ_PLUS_OVERLAY 81 #define IDI_IRC_OVERLAY 82 #define IDI_JABBER_OVERLAY 83 #define IDI_JGTALK_OVERLAY 84 @@ -109,11 +108,6 @@ #define IDI_MIRANDA_YAOL 140 #define IDI_MIRANDA_ZELEBOBA 141 #define IDI_ICQ 190 -#define IDI_ICQ3_OVERLAY 193 -#define IDI_ICQ4_OVERLAY 194 -#define IDI_ICQ5_OVERLAY 195 -#define IDI_ICQ6_OVERLAY 196 -#define IDI_ICQ7_OVERLAY 197 #define IDI_ICQ8_OVERLAY 198 #define IDI_ASIA 202 #define IDI_DICHAT 203 @@ -122,7 +116,6 @@ #define IDI_LIBICQ2000 216 #define IDI_LICQ 217 #define IDI_LOCID 218 -#define IDI_QIP_2005 219 #define IDI_RANDQ 220 #define IDI_SMARTICQ 221 #define IDI_SPAM 222 -- cgit v1.2.3