diff options
| author | dartraiden <wowemuh@gmail.com> | 2019-02-06 12:58:01 +0300 |
|---|---|---|
| committer | dartraiden <wowemuh@gmail.com> | 2019-02-06 12:58:01 +0300 |
| commit | d042071e2926aed6f03b1e1d85d202d0be84c264 (patch) | |
| tree | bc9f4e07e0c162767ff56eb48338546a571f708f | |
| parent | a54b99a40847da462920bcbe8c2e765af5edf1b3 (diff) | |
Fingerprint:
- remove dead ICQ clients (R&Q and ICQ 8 still working)
- rename ICQJ to ICQ
16 files changed, 5 insertions, 39 deletions
diff --git a/plugins/FingerprintNG/iconpacks/res/ICQ/D[i]Chat.ico b/plugins/FingerprintNG/iconpacks/res/ICQ/D[i]Chat.ico Binary files differdeleted file mode 100644 index 5e95926677..0000000000 --- a/plugins/FingerprintNG/iconpacks/res/ICQ/D[i]Chat.ico +++ /dev/null diff --git a/plugins/FingerprintNG/iconpacks/res/ICQ/GnomeICU.ico b/plugins/FingerprintNG/iconpacks/res/ICQ/GnomeICU.ico Binary files differdeleted file mode 100644 index 18ae1b8654..0000000000 --- a/plugins/FingerprintNG/iconpacks/res/ICQ/GnomeICU.ico +++ /dev/null diff --git a/plugins/FingerprintNG/iconpacks/res/ICQ/Jimm.ico b/plugins/FingerprintNG/iconpacks/res/ICQ/Jimm.ico Binary files differdeleted file mode 100644 index 4e9c9f81be..0000000000 --- a/plugins/FingerprintNG/iconpacks/res/ICQ/Jimm.ico +++ /dev/null diff --git a/plugins/FingerprintNG/iconpacks/res/ICQ/LibICQ2000.ico b/plugins/FingerprintNG/iconpacks/res/ICQ/LibICQ2000.ico Binary files differdeleted file mode 100644 index 4f1db624a0..0000000000 --- a/plugins/FingerprintNG/iconpacks/res/ICQ/LibICQ2000.ico +++ /dev/null diff --git a/plugins/FingerprintNG/iconpacks/res/ICQ/Licq.ico b/plugins/FingerprintNG/iconpacks/res/ICQ/Licq.ico Binary files differdeleted file mode 100644 index 40bf723409..0000000000 --- a/plugins/FingerprintNG/iconpacks/res/ICQ/Licq.ico +++ /dev/null diff --git a/plugins/FingerprintNG/iconpacks/res/ICQ/SmartICQ.ico b/plugins/FingerprintNG/iconpacks/res/ICQ/SmartICQ.ico Binary files differdeleted file mode 100644 index 92cfc060eb..0000000000 --- a/plugins/FingerprintNG/iconpacks/res/ICQ/SmartICQ.ico +++ /dev/null diff --git a/plugins/FingerprintNG/iconpacks/res/ICQ/StrICQ.ico b/plugins/FingerprintNG/iconpacks/res/ICQ/StrICQ.ico Binary files differdeleted file mode 100644 index 0ce1b745ba..0000000000 --- a/plugins/FingerprintNG/iconpacks/res/ICQ/StrICQ.ico +++ /dev/null diff --git a/plugins/FingerprintNG/iconpacks/res/ICQ/TICQClient.ico b/plugins/FingerprintNG/iconpacks/res/ICQ/TICQClient.ico Binary files differdeleted file mode 100644 index a0fdb184f4..0000000000 --- a/plugins/FingerprintNG/iconpacks/res/ICQ/TICQClient.ico +++ /dev/null diff --git a/plugins/FingerprintNG/iconpacks/res/ICQ/icy juice.ico b/plugins/FingerprintNG/iconpacks/res/ICQ/icy juice.ico Binary files differdeleted file mode 100644 index 05445e495b..0000000000 --- a/plugins/FingerprintNG/iconpacks/res/ICQ/icy juice.ico +++ /dev/null diff --git a/plugins/FingerprintNG/iconpacks/res/ICQ/locid.ico b/plugins/FingerprintNG/iconpacks/res/ICQ/locid.ico Binary files differdeleted file mode 100644 index a378b71954..0000000000 --- a/plugins/FingerprintNG/iconpacks/res/ICQ/locid.ico +++ /dev/null diff --git a/plugins/FingerprintNG/iconpacks/res/ICQ/spam.ico b/plugins/FingerprintNG/iconpacks/res/ICQ/spam.ico Binary files differdeleted file mode 100644 index fb33ad874b..0000000000 --- a/plugins/FingerprintNG/iconpacks/res/ICQ/spam.ico +++ /dev/null diff --git a/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_ICQJ.ico b/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_ICQ.ico Binary files differindex b010d62498..b010d62498 100644 --- a/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_ICQJ.ico +++ b/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_ICQ.ico diff --git a/plugins/FingerprintNG/iconpacks/res/fp_icons.rc b/plugins/FingerprintNG/iconpacks/res/fp_icons.rc index 62377e53d5..634c904cb2 100644 --- a/plugins/FingerprintNG/iconpacks/res/fp_icons.rc +++ b/plugins/FingerprintNG/iconpacks/res/fp_icons.rc @@ -375,18 +375,7 @@ IDI_XMPP ICON "Jabber\\XMPP.ico" IDI_YAMBI ICON "Jabber\\Yambi.ico"
IDI_YAONLINE ICON "Jabber\\yaonline.ico"
IDI_YAXIM ICON "Jabber\\yaxim.ico"
-IDI_DICHAT ICON "ICQ\\D[i]Chat.ico"
-IDI_GNOMEICU ICON "ICQ\\GnomeICU.ico"
-IDI_ICY_JUICE ICON "ICQ\\Icy Juice.ico"
-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_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_ICQ8_OVERLAY ICON "ICQ\\overlay_ICQ_v8.ico"
IDI_AMIRC ICON "IRC\\AmIRC.ico"
@@ -521,7 +510,7 @@ IDI_HANGOUTS ICON "others\\Google+ Hangouts.ico" 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_ICQ_OVERLAY ICON "overlays\\overlay_proto_ICQ.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 0cdf5d7121..03ad3ed2ba 100644 --- a/plugins/FingerprintNG/src/masks.cpp +++ b/plugins/FingerprintNG/src/masks.cpp @@ -192,19 +192,7 @@ KN_FP_MASK def_kn_fp_mask[] = //#########################################################################################################################################################################
//################################# ICQ ###############################################################################################################################
//#########################################################################################################################################################################
- { "client_D[i]Chat", L"D[i]Chat*", L"D[i]Chat", IDI_DICHAT, ICQ_CASE, TRUE },
- { "client_GnomeICU", L"GnomeICU*", L"GnomeICU", IDI_GNOMEICU, ICQ_CASE, TRUE },
- { "client_Icy_Juice", L"*Icy*Juice*", L"Icy Juice", IDI_ICY_JUICE, ICQ_CASE, TRUE },
- { "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_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 },
-
- { "client_spam", L"*spam*", LPGENW("spam client"), IDI_SPAM, ICQ_CASE, TRUE },
- { "client_libicq2k", L"libicq*", L"LibICQ/JIT", IDI_LIBICQ2000, ICQ_CASE, TRUE },
- { "client_TICQClient", L"*TICQ*Client*", L"TICQClient (Delphi lib)", IDI_TICQ, ICQ_CASE, TRUE },
{ "client_ICQ_all", L"|ICQ?|ICQ?.?|ICQ *|ICQ2*|ICQ", L"ICQ client", IDI_ICQ, ICQ_CASE },
@@ -648,7 +636,7 @@ KN_FP_MASK def_kn_fp_overlays_mask[] = //#########################################################################################################################################################################
//################################# PROTO OVERLAYS ####################################################################################################################
//#########################################################################################################################################################################
- { "client_ICQJ_overlay", L"|^ICQ|^ICQ*|*ICQ*", LPGENW("ICQJ overlay"), IDI_ICQJ_OVERLAY, OVERLAYS_PROTO_CASE },
+ { "client_ICQ_overlay", L"|^ICQ|^ICQ*|*ICQ*", LPGENW("ICQ overlay"), IDI_ICQ_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 },
diff --git a/plugins/FingerprintNG/src/resource.h b/plugins/FingerprintNG/src/resource.h index 31c9d3cfe8..4c54f65033 100644 --- a/plugins/FingerprintNG/src/resource.h +++ b/plugins/FingerprintNG/src/resource.h @@ -55,7 +55,7 @@ #define IDI_PLATFORM_X32 76
#define IDI_PLATFORM_X64 77
#define IDI_GMAIL_OVERLAY 79
-#define IDI_ICQJ_OVERLAY 80
+#define IDI_ICQ_OVERLAY 80
#define IDI_IRC_OVERLAY 82
#define IDI_JABBER_OVERLAY 83
#define IDI_JGTALK_OVERLAY 84
@@ -110,17 +110,7 @@ #define IDI_ICQ 190
#define IDI_ICQ8_OVERLAY 198
#define IDI_ASIA 202
-#define IDI_DICHAT 203
-#define IDI_GNOMEICU 214
-#define IDI_ICY_JUICE 215
-#define IDI_LIBICQ2000 216
-#define IDI_LICQ 217
-#define IDI_LOCID 218
#define IDI_RANDQ 220
-#define IDI_SMARTICQ 221
-#define IDI_SPAM 222
-#define IDI_STRICQ 223
-#define IDI_TICQ 234
#define IDI_IRC 300
#define IDI_AMIRC 301
#define IDI_AMULE 302
@@ -484,7 +474,6 @@ #define IDI_JASMINEIM 1040
#define IDI_JBOTHER 1041
#define IDI_JBUDDY 1042
-#define IDI_JIMM 1043
#define IDI_JIMMY 1044
#define IDI_JIMM_ASPRO 1045
#define IDI_KMESS 1046
diff --git a/plugins/FingerprintNG/src/stdafx.h b/plugins/FingerprintNG/src/stdafx.h index 8840eec89a..a0d7d3ffe1 100644 --- a/plugins/FingerprintNG/src/stdafx.h +++ b/plugins/FingerprintNG/src/stdafx.h @@ -86,8 +86,8 @@ struct FOUNDINFO #define QQ_CASE 3013 // QQ clients (+ versions)
#define RSS_CASE 3014 // RSS clients
#define WEATHER_CASE 3016 // Weather clients
-#define FACEBOOK_CASE 3018 // acebook clients
-#define VK_CASE 3019 // K clients
+#define FACEBOOK_CASE 3018 // Facebook clients
+#define VK_CASE 3019 // VK clients
#define OTHER_PROTOS_CASE 3020 // other protocols
#define OTHERS_CASE 3021 // other icons
|