From e4c5bc44fbc89dbea2bfac9af6665c381fa039fe Mon Sep 17 00:00:00 2001
From: Kirill Volinsky <mataes2007@gmail.com>
Date: Wed, 21 Nov 2012 06:56:28 +0000
Subject: fixed broken jabber overlay detection corrected some others overlay
masks
git-svn-id: http://svn.miranda-ng.org/main/trunk@2408 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
plugins/FingerprintNG/src/masks.cpp | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/plugins/FingerprintNG/src/masks.cpp b/plugins/FingerprintNG/src/masks.cpp
index 905f7889b2..c5dae87118 100644
--- a/plugins/FingerprintNG/src/masks.cpp
+++ b/plugins/FingerprintNG/src/masks.cpp
@@ -617,7 +617,7 @@ KN_FP_MASK def_kn_fp_overlays_mask[] =
{"client_Amatory_pack", _T("*Amatory*"), _T("Amatory"), _T("ClientIcons_packs"), IDI_MIRANDA_AMATORY, MIRANDA_PACKS_CASE },
{"client_BRI_pack", _T("*bri*edition*"), _T("Bri edition"), _T("ClientIcons_packs"), IDI_MIRANDA_BRI, MIRANDA_PACKS_CASE },
{"client_Devil_pack", _T("*6.6.6*"), _T("Devil Suite"), _T("ClientIcons_packs"), IDI_MIRANDA_DEVIL, MIRANDA_PACKS_CASE },
- {"client_E33_pack", _T("*[E33]*"), _T("E33"), _T("ClientIcons_packs"), IDI_MIRANDA_E33, MIRANDA_PACKS_CASE },
+ {"client_E33_pack", _T("*[E33*]*"), _T("E33"), _T("ClientIcons_packs"), IDI_MIRANDA_E33, MIRANDA_PACKS_CASE },
{"client_FR_pack", _T("*FR*Pack*"), _T("Miranda FR"), _T("ClientIcons_packs"), IDI_MIRANDA_FR, MIRANDA_PACKS_CASE },
{"client_Faith_pack", _T("*Faith*Pack*"), _T("Faith"), _T("ClientIcons_packs"), IDI_MIRANDA_FAITH, MIRANDA_PACKS_CASE },
{"client_Final_pack", _T("*[Final*Pack]*"), _T("Final pack"), _T("ClientIcons_packs"), IDI_MIRANDA_FINAL, MIRANDA_PACKS_CASE },
@@ -630,18 +630,18 @@ KN_FP_MASK def_kn_fp_overlays_mask[] =
{"client_Kolich_pack", _T("*Kolich*"), _T("Kolich"), _T("ClientIcons_packs"), IDI_MIRANDA_KOLICH, MIRANDA_PACKS_CASE },
{"client_Kuzzman_pack", _T("*kuzzman*"), _T("Kuzzman"), _T("ClientIcons_packs"), IDI_MIRANDA_KUZZMAN, MIRANDA_PACKS_CASE },
{"client_Lenin_pack", _T("*[Lenin*]*"), _T("Lenin pack"), _T("ClientIcons_packs"), IDI_MIRANDA_LENINPACK, MIRANDA_PACKS_CASE },
- {"client_Lestat_pack", _T("*[Lpack]*"), _T("Lestat pack"), _T("ClientIcons_packs"), IDI_MIRANDA_LESTAT, MIRANDA_PACKS_CASE },
- {"client_LexSys_pack", _T("|*MirandaLS*|*LexSys*"), _T("LexSys"), _T("ClientIcons_packs"), IDI_MIRANDA_LEXSYS, MIRANDA_PACKS_CASE },
+ {"client_Lestat_pack", _T("*[Lpack*]*"), _T("Lestat pack"), _T("ClientIcons_packs"), IDI_MIRANDA_LESTAT, MIRANDA_PACKS_CASE },
+ {"client_LexSys_pack", _T("|*Miranda*LS*|*LexSys*"), _T("LexSys"), _T("ClientIcons_packs"), IDI_MIRANDA_LEXSYS, MIRANDA_PACKS_CASE },
{"client_MD_pack", _T("*MDpack*"), _T("MDpack"), _T("ClientIcons_packs"), IDI_MIRANDA_MD, MIRANDA_PACKS_CASE },
{"client_Mataes_pack", _T("*Mataes*"), _T("Mataes pack"), _T("ClientIcons_packs"), IDI_MIRANDA_MATAES, MIRANDA_PACKS_CASE },
- {"client_Mir_ME_pack", _T("*[Miranda ME]*"), _T("Miranda ME"), _T("ClientIcons_packs"), IDI_MIRANDA_ME, MIRANDA_PACKS_CASE },
+ {"client_Mir_ME_pack", _T("*[Miranda*ME]*"), _T("Miranda ME"), _T("ClientIcons_packs"), IDI_MIRANDA_ME, MIRANDA_PACKS_CASE },
{"client_Native_pack", _T("*Native*"), _T("Native"), _T("ClientIcons_packs"), IDI_MIRANDA_NATIVE, MIRANDA_PACKS_CASE },
- {"client_New_Style_pack", _T("*New Style*"), _T("New Style"), _T("ClientIcons_packs"), IDI_MIRANDA_NEW_STYLE, MIRANDA_PACKS_CASE },
+ {"client_New_Style_pack", _T("*New*Style*"), _T("New Style"), _T("ClientIcons_packs"), IDI_MIRANDA_NEW_STYLE, MIRANDA_PACKS_CASE },
{"client_Pilot_pack", _T("*Pilot*"), _T("Pilot"), _T("ClientIcons_packs"), IDI_MIRANDA_PILOT, MIRANDA_PACKS_CASE },
- {"client_Razunter_pack", _T("*Razunter's*"), _T("Razunter's Pk"), _T("ClientIcons_packs"), IDI_MIRANDA_RAZUNTER, MIRANDA_PACKS_CASE },
- {"client_Robyer_pack", _T("*RobyerPack*"), _T("Robyer pack"), _T("ClientIcons_packs"), IDI_MIRANDA_ROBYER, MIRANDA_PACKS_CASE },
+ {"client_Razunter_pack", _T("*Razunter*"), _T("Razunter's Pk"), _T("ClientIcons_packs"), IDI_MIRANDA_RAZUNTER, MIRANDA_PACKS_CASE },
+ {"client_Robyer_pack", _T("*Robyer*Pack*"), _T("Robyer pack"), _T("ClientIcons_packs"), IDI_MIRANDA_ROBYER, MIRANDA_PACKS_CASE },
{"client_SSS_pack", _T("*sss*pack*"), _T("SSS build"), _T("ClientIcons_packs"), IDI_MIRANDA_SSS_MOD, MIRANDA_PACKS_CASE },
- {"client_Se7ven_pack", _T("|^*sss*|*[S7*pack]*|*[S7]*"), _T("Se7ven"), _T("ClientIcons_packs"), IDI_MIRANDA_SE7VEN, MIRANDA_PACKS_CASE },
+ {"client_Se7ven_pack", _T("|^*sss*|*[S7*pack]*|*[*S7*]*"), _T("Se7ven"), _T("ClientIcons_packs"), IDI_MIRANDA_SE7VEN, MIRANDA_PACKS_CASE },
{"client_SpellhowleR_pack", _T("*Spellhowler*"), _T("xSpellhowleRx pack"), _T("ClientIcons_packs"), IDI_MIRANDA_SPELLHOWLER,MIRANDA_PACKS_CASE },
{"client_Stalker_pack", _T("*Stalker*"), _T("Stalker"), _T("ClientIcons_packs"), IDI_MIRANDA_STALKER, MIRANDA_PACKS_CASE },
{"client_Tweety_pack", _T("*tweety*"), _T("Tweety"), _T("ClientIcons_packs"), IDI_MIRANDA_TWEETY, MIRANDA_PACKS_CASE },
@@ -649,7 +649,7 @@ KN_FP_MASK def_kn_fp_overlays_mask[] =
{"client_ValeraVi_pack", _T("*Valera*Vi*"), _T("ValeraVi"), _T("ClientIcons_packs"), IDI_MIRANDA_VALERAVI, MIRANDA_PACKS_CASE },
{"client_Watcher_pack", _T("*Watcher*"), _T("Watcher pack"), _T("ClientIcons_packs"), IDI_MIRANDA_WATCHER, MIRANDA_PACKS_CASE },
{"client_YAOL_pack", _T("*yaol*"), _T("YAOL"), _T("ClientIcons_packs"), IDI_MIRANDA_YAOL, MIRANDA_PACKS_CASE },
- {"client_dar_veter_pack", _T("*Dar_veter*"), _T("Dar_veter pack"), _T("ClientIcons_packs"), IDI_MIRANDA_DAR, MIRANDA_PACKS_CASE },
+ {"client_dar_veter_pack", _T("*Dar*veter*"), _T("Dar_veter pack"), _T("ClientIcons_packs"), IDI_MIRANDA_DAR, MIRANDA_PACKS_CASE },
{"client_dmikos_pack", _T("*dmikos*"), _T("Dmikos"), _T("ClientIcons_packs"), IDI_MIRANDA_DMIKOS, MIRANDA_PACKS_CASE },
{"client_zeleboba_pack", _T("*zeleboba*"), _T("zeleboba's"), _T("ClientIcons_packs"), IDI_MIRANDA_ZELEBOBA, MIRANDA_PACKS_CASE },
@@ -662,7 +662,7 @@ KN_FP_MASK def_kn_fp_overlays_mask[] =
{"client_IRC_overlay", _T("|^IRC*|Miranda*IRC*"), _T("IRC overlay"), _T("ClientIcons_overlays"), IDI_IRC_OVERLAY, OVERLAYS_PROTO_CASE },
{"client_JGmail_overlay", _T("*JGmail*"), _T("JGmail overlay"), _T("ClientIcons_overlays"), IDI_GMAIL_OVERLAY, OVERLAYS_PROTO_CASE },
{"client_JGTalk_overlay", _T("*JGTalk*"), _T("JGTalk overlay"), _T("ClientIcons_overlays"), IDI_JGTALK_OVERLAY, OVERLAYS_PROTO_CASE },
- {"client_Jabber_overlay", _T("|^*jabber*|Miranda*Jabber*|py*jabb*"), _T("Jabber overlay"), _T("ClientIcons_overlays"), IDI_JABBER_OVERLAY, OVERLAYS_PROTO_CASE },
+ {"client_Jabber_overlay", _T("|^jabber*|Miranda*Jabber*|py*jabb*"), _T("Jabber overlay"), _T("ClientIcons_overlays"), IDI_JABBER_OVERLAY, OVERLAYS_PROTO_CASE },
{"client_MRA_overlay", _T("|^MRA*|^Mail.ru*|*MRA*|*Mail.ru*IM*"), _T("Mail.Ru Agent overlay"), _T("ClientIcons_overlays"), IDI_MAILRU_OVERLAY, OVERLAYS_PROTO_CASE },
{"client_MSN_overlay", _T("|^MSN*|*Miranda*MSN*"), _T("MSN overlay"), _T("ClientIcons_overlays"), IDI_MSN_OVERLAY, OVERLAYS_PROTO_CASE },
{"client_QQ_overlay", _T("|Miranda*QQ*|MIM*QQ*"), _T("QQ overlay"), _T("ClientIcons_overlays"), IDI_QQ_OVERLAY, OVERLAYS_PROTO_CASE },
@@ -735,8 +735,8 @@ KN_FP_MASK def_kn_fp_overlays2_mask[] =
{"client_work_overlay", _T("|*[*work*]*|*[*������*]*|*wrk*"), _T("[Work]"), _T("ClientIcons_overlays"), IDI_WORK_OVERLAY, OVERLAYS_RESOURCE_CASE },
{"client_office_overlay", _T("|*[*office*]*|*[*����*]*"), _T("[Office]"), _T("ClientIcons_overlays"), IDI_OFFICE_OVERLAY, OVERLAYS_RESOURCE_CASE },
{"client_mobile_overlay", _T("|*[*mobile*]*|*[*pda*]*"), _T("mobile overlay"), _T("ClientIcons_overlays"), IDI_MOBILE_OVERLAY, OVERLAYS_RESOURCE_CASE },
- {"client_note_overlay", _T("|*[*note*]*|*[*laptop*]*|*[*usb*]*")
- _T("|*[*������*]*|*[*portable*]*|"), _T("notebook overlay"), _T("ClientIcons_overlays"), IDI_NOTEBOOK_OVERLAY, OVERLAYS_RESOURCE_CASE },
+ {"client_note_overlay", _T("|*[*note*]*|*[*laptop*]*|*[*portable*]*")
+ _T("|*[*������*]*|*[*flash*]*|*[*usb*]*"), _T("notebook overlay"), _T("ClientIcons_overlays"), IDI_NOTEBOOK_OVERLAY, OVERLAYS_RESOURCE_CASE },
{"client_Mir_010_over", _T("*Miranda*0.10.*"), _T("Miranda v0.10 #2 overlay"), _T("ClientIcons_Miranda"), IDI_MIRANDA_10s, MIRANDA_VERSION_CASE },
{"client_Mir_09_over", _T("*Miranda*0.9.*"), _T("Miranda v0.9 #2 overlay"), _T("ClientIcons_Miranda"), IDI_MIRANDA_9s, MIRANDA_VERSION_CASE },
--
cgit v1.2.3