diff options
45 files changed, 317 insertions, 378 deletions
diff --git a/plugins/FingerprintNG/icons/AIM/AIM.ico b/plugins/FingerprintNG/icons/AIM/AIM.ico Binary files differdeleted file mode 100644 index 4e8ccf5377..0000000000 --- a/plugins/FingerprintNG/icons/AIM/AIM.ico +++ /dev/null diff --git a/plugins/FingerprintNG/icons/ICQ/&RQ.ico b/plugins/FingerprintNG/icons/ICQ/&RQ.ico Binary files differdeleted file mode 100644 index 76641854cc..0000000000 --- a/plugins/FingerprintNG/icons/ICQ/&RQ.ico +++ /dev/null diff --git a/plugins/FingerprintNG/icons/ICQ/Anastasia.ico b/plugins/FingerprintNG/icons/ICQ/Anastasia.ico Binary files differdeleted file mode 100644 index 3f2cce730c..0000000000 --- a/plugins/FingerprintNG/icons/ICQ/Anastasia.ico +++ /dev/null diff --git a/plugins/FingerprintNG/icons/ICQ/CenterICQ.ico b/plugins/FingerprintNG/icons/ICQ/CenterICQ.ico Binary files differdeleted file mode 100644 index 926dbce7c3..0000000000 --- a/plugins/FingerprintNG/icons/ICQ/CenterICQ.ico +++ /dev/null diff --git a/plugins/FingerprintNG/icons/ICQ/Delphi.ico b/plugins/FingerprintNG/icons/ICQ/Delphi.ico Binary files differdeleted file mode 100644 index 53eca79b17..0000000000 --- a/plugins/FingerprintNG/icons/ICQ/Delphi.ico +++ /dev/null diff --git a/plugins/FingerprintNG/icons/ICQ/GlICQ.ico b/plugins/FingerprintNG/icons/ICQ/GlICQ.ico Binary files differdeleted file mode 100644 index d50116b147..0000000000 --- a/plugins/FingerprintNG/icons/ICQ/GlICQ.ico +++ /dev/null diff --git a/plugins/FingerprintNG/icons/ICQ/IC@.ico b/plugins/FingerprintNG/icons/ICQ/IC@.ico Binary files differdeleted file mode 100644 index 5a1616e9de..0000000000 --- a/plugins/FingerprintNG/icons/ICQ/IC@.ico +++ /dev/null diff --git a/plugins/FingerprintNG/icons/ICQ/ICQ_2.x.ico b/plugins/FingerprintNG/icons/ICQ/ICQ_2.x.ico Binary files differdeleted file mode 100644 index 464dea375e..0000000000 --- a/plugins/FingerprintNG/icons/ICQ/ICQ_2.x.ico +++ /dev/null diff --git a/plugins/FingerprintNG/icons/ICQ/JICQ.ico b/plugins/FingerprintNG/icons/ICQ/JICQ.ico Binary files differdeleted file mode 100644 index a8bfab6332..0000000000 --- a/plugins/FingerprintNG/icons/ICQ/JICQ.ico +++ /dev/null diff --git a/plugins/FingerprintNG/icons/ICQ/KM_Aska.ico b/plugins/FingerprintNG/icons/ICQ/KM_Aska.ico Binary files differdeleted file mode 100644 index 60b41844cf..0000000000 --- a/plugins/FingerprintNG/icons/ICQ/KM_Aska.ico +++ /dev/null diff --git a/plugins/FingerprintNG/icons/ICQ/MIP.ico b/plugins/FingerprintNG/icons/ICQ/MIP.ico Binary files differdeleted file mode 100644 index 2dde177782..0000000000 --- a/plugins/FingerprintNG/icons/ICQ/MIP.ico +++ /dev/null diff --git a/plugins/FingerprintNG/icons/ICQ/NanoICQ.ico b/plugins/FingerprintNG/icons/ICQ/NanoICQ.ico Binary files differdeleted file mode 100644 index 9cd92abf87..0000000000 --- a/plugins/FingerprintNG/icons/ICQ/NanoICQ.ico +++ /dev/null diff --git a/plugins/FingerprintNG/icons/ICQ/Smaper.ico b/plugins/FingerprintNG/icons/ICQ/Smaper.ico Binary files differdeleted file mode 100644 index f621d345ad..0000000000 --- a/plugins/FingerprintNG/icons/ICQ/Smaper.ico +++ /dev/null diff --git a/plugins/FingerprintNG/icons/ICQ/SmartICQ.ico b/plugins/FingerprintNG/icons/ICQ/SmartICQ.ico Binary files differindex cfc12ef103..92cfc060eb 100644 --- a/plugins/FingerprintNG/icons/ICQ/SmartICQ.ico +++ b/plugins/FingerprintNG/icons/ICQ/SmartICQ.ico diff --git a/plugins/FingerprintNG/icons/ICQ/TICQ.ico b/plugins/FingerprintNG/icons/ICQ/TICQ.ico Binary files differdeleted file mode 100644 index 8e10375ab5..0000000000 --- a/plugins/FingerprintNG/icons/ICQ/TICQ.ico +++ /dev/null diff --git a/plugins/FingerprintNG/icons/ICQ/TICQClient.ico b/plugins/FingerprintNG/icons/ICQ/TICQClient.ico Binary files differnew file mode 100644 index 0000000000..a0fdb184f4 --- /dev/null +++ b/plugins/FingerprintNG/icons/ICQ/TICQClient.ico diff --git a/plugins/FingerprintNG/icons/ICQ/WebICQ.ico b/plugins/FingerprintNG/icons/ICQ/WebICQ.ico Binary files differdeleted file mode 100644 index 683ceeeb92..0000000000 --- a/plugins/FingerprintNG/icons/ICQ/WebICQ.ico +++ /dev/null diff --git a/plugins/FingerprintNG/icons/ICQ/YSM.ico b/plugins/FingerprintNG/icons/ICQ/YSM.ico Binary files differdeleted file mode 100644 index a1d3dc0550..0000000000 --- a/plugins/FingerprintNG/icons/ICQ/YSM.ico +++ /dev/null diff --git a/plugins/FingerprintNG/icons/ICQ/Yeemp.ico b/plugins/FingerprintNG/icons/ICQ/Yeemp.ico Binary files differdeleted file mode 100644 index 239232a46f..0000000000 --- a/plugins/FingerprintNG/icons/ICQ/Yeemp.ico +++ /dev/null diff --git a/plugins/FingerprintNG/icons/ICQ/alICQ.ico b/plugins/FingerprintNG/icons/ICQ/alICQ.ico Binary files differdeleted file mode 100644 index 1538670ab6..0000000000 --- a/plugins/FingerprintNG/icons/ICQ/alICQ.ico +++ /dev/null diff --git a/plugins/FingerprintNG/icons/ICQ/biohazard.ico b/plugins/FingerprintNG/icons/ICQ/biohazard.ico Binary files differdeleted file mode 100644 index f938ba7898..0000000000 --- a/plugins/FingerprintNG/icons/ICQ/biohazard.ico +++ /dev/null diff --git a/plugins/FingerprintNG/icons/ICQ/corepager.ico b/plugins/FingerprintNG/icons/ICQ/corepager.ico Binary files differdeleted file mode 100644 index 4955a3c935..0000000000 --- a/plugins/FingerprintNG/icons/ICQ/corepager.ico +++ /dev/null diff --git a/plugins/FingerprintNG/icons/ICQ/kxICQ2.ico b/plugins/FingerprintNG/icons/ICQ/kxICQ2.ico Binary files differdeleted file mode 100644 index 2dfcfed4ad..0000000000 --- a/plugins/FingerprintNG/icons/ICQ/kxICQ2.ico +++ /dev/null diff --git a/plugins/FingerprintNG/icons/ICQ/mICQ.ico b/plugins/FingerprintNG/icons/ICQ/mICQ.ico Binary files differdeleted file mode 100644 index be8a3a3d2b..0000000000 --- a/plugins/FingerprintNG/icons/ICQ/mICQ.ico +++ /dev/null diff --git a/plugins/FingerprintNG/icons/ICQ/nICQ.ico b/plugins/FingerprintNG/icons/ICQ/nICQ.ico Binary files differdeleted file mode 100644 index c3ab679403..0000000000 --- a/plugins/FingerprintNG/icons/ICQ/nICQ.ico +++ /dev/null diff --git a/plugins/FingerprintNG/icons/ICQ/Spambot.ico b/plugins/FingerprintNG/icons/ICQ/spam.ico Binary files differindex fb33ad874b..fb33ad874b 100644 --- a/plugins/FingerprintNG/icons/ICQ/Spambot.ico +++ b/plugins/FingerprintNG/icons/ICQ/spam.ico diff --git a/plugins/FingerprintNG/icons/ICQ/stICQ.ico b/plugins/FingerprintNG/icons/ICQ/stICQ.ico Binary files differdeleted file mode 100644 index 55c85882eb..0000000000 --- a/plugins/FingerprintNG/icons/ICQ/stICQ.ico +++ /dev/null diff --git a/plugins/FingerprintNG/icons/ICQ/vICQ.ico b/plugins/FingerprintNG/icons/ICQ/vICQ.ico Binary files differdeleted file mode 100644 index 48bda59a0c..0000000000 --- a/plugins/FingerprintNG/icons/ICQ/vICQ.ico +++ /dev/null diff --git a/plugins/FingerprintNG/icons/ICQ/vmICQ.ico b/plugins/FingerprintNG/icons/ICQ/vmICQ.ico Binary files differdeleted file mode 100644 index e9457245be..0000000000 --- a/plugins/FingerprintNG/icons/ICQ/vmICQ.ico +++ /dev/null diff --git a/plugins/FingerprintNG/icons/Weather/accu.ico b/plugins/FingerprintNG/icons/Weather/accu.ico Binary files differdeleted file mode 100644 index 2093aee5a6..0000000000 --- a/plugins/FingerprintNG/icons/Weather/accu.ico +++ /dev/null diff --git a/plugins/FingerprintNG/icons/Weather/weather_2.ico b/plugins/FingerprintNG/icons/Weather/weather_2.ico Binary files differdeleted file mode 100644 index b907fc3c9c..0000000000 --- a/plugins/FingerprintNG/icons/Weather/weather_2.ico +++ /dev/null diff --git a/plugins/FingerprintNG/icons/ICQ/1&1.ico b/plugins/FingerprintNG/icons/multi-protocol/1&1.ico Binary files differindex f812e41128..f812e41128 100644 --- a/plugins/FingerprintNG/icons/ICQ/1&1.ico +++ b/plugins/FingerprintNG/icons/multi-protocol/1&1.ico diff --git a/plugins/FingerprintNG/icons/multi-protocol/Pigeon 3.ico b/plugins/FingerprintNG/icons/multi-protocol/Pigeon 3.ico Binary files differdeleted file mode 100644 index 71f6af5dfa..0000000000 --- a/plugins/FingerprintNG/icons/multi-protocol/Pigeon 3.ico +++ /dev/null diff --git a/plugins/FingerprintNG/icons/multi-protocol/Qnext.ico b/plugins/FingerprintNG/icons/multi-protocol/Qnext.ico Binary files differindex 123e23fe0e..0ed92a6ba9 100644 --- a/plugins/FingerprintNG/icons/multi-protocol/Qnext.ico +++ b/plugins/FingerprintNG/icons/multi-protocol/Qnext.ico diff --git a/plugins/FingerprintNG/icons/ICQ/asia.ico b/plugins/FingerprintNG/icons/multi-protocol/asia.ico Binary files differindex c4b99a032d..c4b99a032d 100644 --- a/plugins/FingerprintNG/icons/ICQ/asia.ico +++ b/plugins/FingerprintNG/icons/multi-protocol/asia.ico diff --git a/plugins/FingerprintNG/icons/Jabber/xfire.ico b/plugins/FingerprintNG/icons/others/xfire.ico Binary files differindex 622746b5c0..622746b5c0 100644 --- a/plugins/FingerprintNG/icons/Jabber/xfire.ico +++ b/plugins/FingerprintNG/icons/others/xfire.ico diff --git a/plugins/FingerprintNG/res/icons_AIM.rc b/plugins/FingerprintNG/res/icons_AIM.rc index 4243201505..973ceb25b8 100644 --- a/plugins/FingerprintNG/res/icons_AIM.rc +++ b/plugins/FingerprintNG/res/icons_AIM.rc @@ -42,7 +42,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US  //##############################################################################################################
  //################################################# AIM ########################################################
  //##############################################################################################################
 -   IDI_AIM               ICON    "..\\icons\\AIM\\AIM.ico"
     IDI_AIM_4               ICON    "..\\icons\\AIM\\AIM_4.x.ico"
     IDI_AIM_5               ICON    "..\\icons\\AIM\\AIM_5.x.ico"
     IDI_AIM_6               ICON    "..\\icons\\AIM\\AIM_6.x.ico"
 diff --git a/plugins/FingerprintNG/res/icons_ICQ.rc b/plugins/FingerprintNG/res/icons_ICQ.rc index b602c3f4ba..27b3b9091a 100644 --- a/plugins/FingerprintNG/res/icons_ICQ.rc +++ b/plugins/FingerprintNG/res/icons_ICQ.rc @@ -42,67 +42,33 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US  //##############################################################################################################
  //########################################## Unofficial ICQ clients ############################################
  //##############################################################################################################
 -   IDI_1UND1              ICON    "..\\icons\\ICQ\\1&1.ico"
 -   IDI_ALICQ               ICON    "..\\icons\\ICQ\\Alicq.ico"
 -   IDI_ANASTASIA           ICON    "..\\icons\\ICQ\\Anastasia.ico"
 -   IDI_ANDRQ               ICON    "..\\icons\\ICQ\\&RQ.ico"
 -   IDI_ASIA		ICON	"..\\icons\\ICQ\\Asia.ico"
 -   IDI_COREPAGER           ICON    "..\\icons\\ICQ\\corepager.ico"
 -   IDI_DELPHI              ICON    "..\\icons\\ICQ\\Delphi.ico"
 -   IDI_DICHAT              ICON    "..\\icons\\ICQ\\D[i]Chat.ico"
 -   IDI_GLICQ               ICON    "..\\icons\\ICQ\\GLICQ.ico"
 -   IDI_GNOMEICU            ICON    "..\\icons\\ICQ\\GnomeICU.ico"
 -   IDI_ICAT                ICON    "..\\icons\\ICQ\\IC@.ico"
 -   IDI_ICQ2X               ICON    "..\\icons\\ICQ\\ICQ_2.x.ico"
 -   IDI_ICY_JUICE		ICON	"..\\icons\\ICQ\\Icy Juice.ico"
 -   IDI_CENTERICQ           ICON    "..\\icons\\ICQ\\CenterICQ.ico"
 -   IDI_JICQ                ICON    "..\\icons\\ICQ\\JICQ.ico"
 -//	IDI_KMASKA				ICON    "..\\icons\\ICQ\\KM_Aska.ico"
 -   IDI_KXICQ               ICON    "..\\icons\\ICQ\\kxICQ2.ico"
 -   IDI_LIBICQ2000          ICON    "..\\icons\\ICQ\\LibICQ2000.ico"
 -   IDI_LICQ                ICON    "..\\icons\\ICQ\\Licq.ico"
 -   IDI_LOCID               ICON    "..\\icons\\ICQ\\locid.ico"
 -   IDI_MICQ                ICON    "..\\icons\\ICQ\\mICQ.ico"
 -   IDI_MIP                 ICON    "..\\icons\\ICQ\\MIP.ico"
 -   IDI_NANOICQ             ICON    "..\\icons\\ICQ\\NanoICQ.ico"
 -   IDI_NICQ                ICON    "..\\icons\\ICQ\\nICQ.ico"
 -   IDI_QIP                 ICON    "..\\icons\\ICQ\\QIP.ico"
 -   IDI_RANDQ_NEW           ICON    "..\\icons\\ICQ\\R&Q.ico"
 -
 -   IDI_SMAPER              ICON    "..\\icons\\ICQ\\smaper.ico"
 -   IDI_SMARTICQ            ICON    "..\\icons\\ICQ\\SmartICQ.ico"
 -   IDI_SPAMBOT             ICON    "..\\icons\\ICQ\\Spambot.ico"
 -   IDI_STICQ               ICON    "..\\icons\\ICQ\\stICQ.ico"
 -   IDI_STRICQ              ICON    "..\\icons\\ICQ\\StrICQ.ico"
 -   IDI_TICQ					ICON	"..\\icons\\ICQ\\TICQ.ico"
 -   IDI_VICQ                ICON    "..\\icons\\ICQ\\vICQ.ico"
 -   IDI_VIRUS               ICON    "..\\icons\\ICQ\\Biohazard.ico"
 -   IDI_VMICQ               ICON    "..\\icons\\ICQ\\vmICQ.ico"
 -   IDI_WEBICQ              ICON    "..\\icons\\ICQ\\WebICQ.ico"
 -   IDI_YEEMP               ICON    "..\\icons\\ICQ\\Yeemp.ico"
 -   IDI_YSM                 ICON    "..\\icons\\ICQ\\YSM.ico"
 -   
 -   
 +	IDI_DICHAT              ICON    "..\\icons\\ICQ\\D[i]Chat.ico"
 +	IDI_GNOMEICU            ICON    "..\\icons\\ICQ\\GnomeICU.ico"
 +	IDI_ICY_JUICE		ICON	"..\\icons\\ICQ\\Icy Juice.ico"
 +	IDI_JIMM                ICON    "..\\icons\\multi-protocol\\Jimm.ico"
 +	IDI_LIBICQ2000          ICON    "..\\icons\\ICQ\\LibICQ2000.ico"
 +	IDI_LICQ                ICON    "..\\icons\\ICQ\\Licq.ico"
 +	IDI_LOCID               ICON    "..\\icons\\ICQ\\locid.ico"
 +	IDI_QIP_2005            ICON    "..\\icons\\ICQ\\QIP.ico"
 +	IDI_RANDQ   		        ICON    "..\\icons\\ICQ\\R&Q.ico"
 +	IDI_SMARTICQ            ICON    "..\\icons\\ICQ\\SmartICQ.ico"
 +	IDI_SPAM					ICON    "..\\icons\\ICQ\\spam.ico"
 +	IDI_STRICQ              ICON    "..\\icons\\ICQ\\StrICQ.ico"
 +	IDI_TICQ					ICON	"..\\icons\\ICQ\\TICQClient.ico"
 +
  //##############################################################################################################
  //############################################# Official ICQ clients ###########################################
  //##############################################################################################################
 -	IDI_AIM                 ICON    "..\\icons\\AIM\\AIM.ico"
  	IDI_ICQ                 ICON    "..\\icons\\ICQ\\official\\ICQ.ico" 
 -   
 -//##############################################################################################################
 -//################################################## Overlays ##################################################
 -//##############################################################################################################
  //##############################################################################################################
  //################################# ICQ overlays ###############################################################
  //##############################################################################################################
 -
     IDI_ICQ6_OVERLAY          ICON    "..\\icons\\ICQ\\official\\overlay_ICQ_v6.ico"
     IDI_ICQ7_OVERLAY          ICON    "..\\icons\\ICQ\\official\\overlay_ICQ_v7.ico"
     IDI_ICQ8_OVERLAY          ICON    "..\\icons\\ICQ\\official\\overlay_ICQ_v8.ico"
 -
  /////////////////////////////////////////////////////////////////////////////
  //
  // String Table
 diff --git a/plugins/FingerprintNG/res/icons_Weather.rc b/plugins/FingerprintNG/res/icons_Weather.rc index 80d116fcb6..fa0e4d12f1 100644 --- a/plugins/FingerprintNG/res/icons_Weather.rc +++ b/plugins/FingerprintNG/res/icons_Weather.rc @@ -42,7 +42,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US  //##############################################################################################################
  //############################################# Weather ########################################################
  //##############################################################################################################
 -   IDI_ACCU                ICON    "..\\icons\\Weather\\accu.ico"
 +   IDI_ACCU                ICON    "..\\icons\\Weather\\AccuWeather.ico"
     IDI_GISMETEO            ICON    "..\\icons\\Weather\\gismeteo.ico"
     IDI_INTELLI             ICON    "..\\icons\\Weather\\intelli.ico"
     IDI_METEOGID            ICON    "..\\icons\\Weather\\meteogid.ico"
 diff --git a/plugins/FingerprintNG/res/icons_multiproto.rc b/plugins/FingerprintNG/res/icons_multiproto.rc index 1b1127bc76..768b1efc9d 100644 --- a/plugins/FingerprintNG/res/icons_multiproto.rc +++ b/plugins/FingerprintNG/res/icons_multiproto.rc @@ -43,8 +43,10 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US  //#################################### Multi-protocol clients ##################################################
  //##############################################################################################################
 -	IDI_AIM                 ICON    "..\\icons\\AIM\\AIM.ico"
 +	IDI_AIM_7				ICON    "..\\icons\\AIM\\AIM_7.x.ico"
 +	IDI_1UND1				ICON	"..\\icons\\multi-protocol\\1&1.ico"
 +	IDI_ASIA				ICON	"..\\icons\\multi-protocol\\Asia.ico"
  	IDI_ADIUM               ICON    "..\\icons\\multi-protocol\\Adium.ico"
  	IDI_AGILE               ICON    "..\\icons\\multi-protocol\\AgileMobile.ico"
  	IDI_ANDROID             ICON    "..\\icons\\multi-protocol\\Android.ico"
 @@ -91,7 +93,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US  	IDI_JASMINEIM           ICON    "..\\icons\\multi-protocol\\JasmineIM.ico"
  	IDI_JBOTHER             ICON    "..\\icons\\multi-protocol\\JBother.ico"
  	IDI_JBUDDY          	ICON	"..\\icons\\multi-protocol\\JBuddy Messenger.ico"
 -	IDI_JIMM                ICON    "..\\icons\\multi-protocol\\Jimm.ico"
  	IDI_JIMMY	         	ICON	"..\\icons\\multi-protocol\\JimmyIM.ico"
  	IDI_JIMM_ASPRO      	ICON	"..\\icons\\multi-protocol\\Jimm Aspro.ico"
  	IDI_KMESS           	ICON	"..\\icons\\multi-protocol\\KMess.ico"
 @@ -143,7 +144,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US  	IDI_YAMIGO              ICON    "..\\icons\\multi-protocol\\Yamigo.ico"
  	IDI_YEIGO           	ICON	"..\\icons\\multi-protocol\\Yeigo.ico"
  	IDI_YOONO           	ICON	"..\\icons\\multi-protocol\\Yoono.ico"
 -	
 +	IDI_XFIRE               ICON    "..\\icons\\others\\xfire.ico"
 +
  /////////////////////////////////////////////////////////////////////////////
  //
  // String Table
 diff --git a/plugins/FingerprintNG/src/finger_groups.h b/plugins/FingerprintNG/src/finger_groups.h index 8fb4332fe4..3697d9f0d1 100644 --- a/plugins/FingerprintNG/src/finger_groups.h +++ b/plugins/FingerprintNG/src/finger_groups.h @@ -28,17 +28,12 @@ case GG_CASE:  		return _T("Client Icons/Gadu-Gadu clients");
  	break;
 -
 -case ICQ_OFFICIAL_CASE:
 -	if ( db_get_b(NULL, "Finger", "GroupICQ", 1))
 -		return _T("Client Icons/ICQ official clients");
  	break;
  case ICQ_CASE:
  	if ( db_get_b(NULL, "Finger", "GroupICQ", 1))
  		return _T("Client Icons/ICQ clients");
  	break;
 -
  case IRC_CASE:
  	if ( db_get_b(NULL, "Finger", "GroupIRC", 1))
  		return _T("Client Icons/IRC clients");
 diff --git a/plugins/FingerprintNG/src/global.h b/plugins/FingerprintNG/src/global.h index 91f1a035e4..7d64191320 100644 --- a/plugins/FingerprintNG/src/global.h +++ b/plugins/FingerprintNG/src/global.h @@ -99,34 +99,31 @@ typedef struct _foundInfo  	HANDLE	hRegisteredImage;
  } FOUNDINFO;
 -#define MIRANDA_CASE				1 	//	Miranda clients
 -#define MIRANDA_VERSION_CASE		2 	//	Miranda version overlays
 -#define MIRANDA_PACKS_CASE			3 	//	Miranda packs overlays
 -
 -#define MULTI_CASE					4 	//	multi-protocol clients
 -#define AIM_CASE					5 	//	AIM clients
 -#define GG_CASE						6 	//	Gadu-Gadu clients
 -
 -#define ICQ_OFFICIAL_CASE			7 	//	ICQ official clients (+ versions)
 -#define ICQ_CASE					8 	//	ICQ clients
 -
 -#define IRC_CASE					9 	//	IRC clients
 -#define JABBER_CASE					10	//	Jabber clients
 -#define MRA_CASE					11	//	Mail.Ru Agent clients
 -#define MSN_CASE					12	//	MSN clients
 -#define QQ_CASE						13	//	QQ clients (+ versions)
 -#define RSS_CASE					14	//	RSS clients
 -#define TLEN_CASE					15	//	Tlen clients (+ versions)
 -#define WEATHER_CASE				16	//	Weather clients
 -#define YAHOO_CASE					17	//	Yahoo clients (+ versions)
 -
 -#define OTHER_PROTOS_CASE			18	//	other protocols
 -#define OTHERS_CASE					19	//	other icons
 -
 -#define OVERLAYS_RESOURCE_CASE		20	//	resource overlays
 -#define OVERLAYS_PLATFORM_CASE		21	//	platforms overlays
 -#define OVERLAYS_PROTO_CASE			22	//	protocols overlays
 -#define OVERLAYS_SECURITY_CASE		23	//	security overlays
 +#define MIRANDA_CASE				3001 	//	Miranda clients
 +#define MIRANDA_VERSION_CASE		3002 	//	Miranda version overlays
 +#define MIRANDA_PACKS_CASE			3003 	//	Miranda packs overlays
 +
 +#define MULTI_CASE					3004 	//	multi-protocol clients
 +#define AIM_CASE					3005 	//	AIM clients
 +#define GG_CASE						3006 	//	Gadu-Gadu clients
 +#define ICQ_CASE					3008 	//	ICQ clients
 +#define IRC_CASE					3009 	//	IRC clients
 +#define JABBER_CASE					3010	//	Jabber clients
 +#define MRA_CASE					3011	//	Mail.Ru Agent clients
 +#define MSN_CASE					3012	//	MSN clients
 +#define QQ_CASE						3013	//	QQ clients (+ versions)
 +#define RSS_CASE					3014	//	RSS clients
 +#define TLEN_CASE					3015	//	Tlen clients (+ versions)
 +#define WEATHER_CASE				3016	//	Weather clients
 +#define YAHOO_CASE					3017	//	Yahoo clients (+ versions)
 +
 +#define OTHER_PROTOS_CASE			3018	//	other protocols
 +#define OTHERS_CASE					3019	//	other icons
 +
 +#define OVERLAYS_RESOURCE_CASE		3020	//	resource overlays
 +#define OVERLAYS_PLATFORM_CASE		3021	//	platforms overlays
 +#define OVERLAYS_PROTO_CASE			3022	//	protocols overlays
 +#define OVERLAYS_SECURITY_CASE		3023	//	security overlays
  /*
  #define OVERLAYS_RESOURCE_ALT_CASE	24	//	alternative (old style) overlays
 diff --git a/plugins/FingerprintNG/src/masks.cpp b/plugins/FingerprintNG/src/masks.cpp index 91c0663236..93bb5f11e6 100644 --- a/plugins/FingerprintNG/src/masks.cpp +++ b/plugins/FingerprintNG/src/masks.cpp @@ -56,8 +56,8 @@ KN_FP_MASK def_kn_fp_mask[] =  	{"client_Miranda_010xx",	_T("Miranda*IM*0.10.*"),					_T("MirandaIM v0.10.x.x"),				_T("ClientIcons_Miranda"),		IDI_MIRANDA_010X,		MIRANDA_CASE	},
  	{"client_Miranda_09XX",		_T("|*Miranda*IM*0.9*")
  								_T("|*miranda-im.org/caps#*0.9*"),			_T("MirandaIM v0.9.x.x"),				_T("ClientIcons_Miranda"),		IDI_MIRANDA_09XX,		MIRANDA_CASE	},
 -	{"client_Miranda_08XX",		_T("|^Mira*0.7*Jabb*")
 -								_T("|*Mira*0.8*")
 +	{"client_Miranda_08XX",		_T("|^Miranda*0.7*Jabb*")
 +								_T("|*Miranda*0.8*")
  								_T("|*miranda-im.org/caps#*0.8*"),			_T("MirandaIM v0.8.x.x"),				_T("ClientIcons_Miranda"),		IDI_MIRANDA_08XX,		MIRANDA_CASE	},
  	{"client_Miranda_07XX",		_T("|*Miranda*0.7*")
  								_T("|*miranda-im.org/caps#*0.7*"),			_T("MirandaIM v0.7.x.x"),				_T("ClientIcons_Miranda"),		IDI_MIRANDA_07XX,		MIRANDA_CASE	},
 @@ -72,75 +72,78 @@ KN_FP_MASK def_kn_fp_mask[] =  //###########################################################################################################################################################################################################
  //#################################		MULTI-PROTOCOL	#####################################################################################################################################################
  //###########################################################################################################################################################################################################
 +	{"client_1&1",				_T("|*Pocket*Web*|*1&1*|*1*?nd*1"),			_T("1&1"),								_T("ClientIcons_multiproto"),	IDI_1UND1,				MULTI_CASE,	TRUE	},
 +	{"client_Asia",				_T("*Asia*"),								_T("Asia"),								_T("ClientIcons_multiproto"),	IDI_ASIA,				MULTI_CASE,	TRUE	},
  	{"client_Adium",			_T("|*Adium*")
  								_T("|*VUFD6HcFmUT2NxJkBGCiKlZnS3M=*") 		// Gabble client?
 -								_T("|*DdnydQG7RGhP9E3k9Sf+b+bF0zo=*"),		_T("Adium"),							_T("ClientIcons_multiproto"),	IDI_ADIUM,				MULTI_CASE	},
 -	{"client_AgileMessenger",	_T("*Agile Messenger*"),					_T("Agile Messenger"),					_T("ClientIcons_multiproto"),	IDI_AGILE,				MULTI_CASE	},
 -
 -	{"client_Appolo",			_T("*Appolo*"),								_T("Appolo IM"),						_T("ClientIcons_multiproto"),	IDI_APPOLO,				MULTI_CASE	},
 -	{"client_Ayttm",			_T("*Ayttm*"),								_T("Ayttm"),							_T("ClientIcons_multiproto"),	IDI_AYTTM,				MULTI_CASE	},
 -	{"client_BayanICQ",			_T("|*Bayan*ICQ*|*barobin*"),				_T("BayanICQ"),							_T("ClientIcons_multiproto"),	IDI_BAYANICQ,			MULTI_CASE	},
 -	{"client_Beejive",			_T("*Beejive*"),							_T("BeejiveIM"),						_T("ClientIcons_multiproto"),	IDI_BEEJIVE,			MULTI_CASE	},
 -	{"client_Bimoid",			_T("*Bimoid*"),								_T("Bimoid"),							_T("ClientIcons_multiproto"),	IDI_BIMOID,				MULTI_CASE	},
 -	{"client_BitlBee",			_T("*BitlBee*"),							_T("BitlBee"),							_T("ClientIcons_multiproto"),	IDI_BITLBEE,			MULTI_CASE	},
 -	{"client_BlackBerry",		_T("|*Berry*|*ICS?\?\?\?\?\?\?\?"),			_T("BlackBerry"),						_T("ClientIcons_multiproto"),	IDI_BLACKBERRY,			MULTI_CASE	},
 -	{"client_Buddycloud",		_T("*Buddycloud*"),							_T("Buddycloud"),						_T("ClientIcons_multiproto"),	IDI_BUDDYCLOUD,			MULTI_CASE	},
 -	{"client_Carrier",			_T("*Carrier*"),							_T("Carrier client"),					_T("ClientIcons_multiproto"),	IDI_CARRIER,			MULTI_CASE	},
 -	{"client_Causerie",			_T("*Causerie*"),							_T("Causerie"),							_T("ClientIcons_multiproto"),	IDI_CAUSERIE,			MULTI_CASE	},
 -	{"client_CenterIM",			_T("*CenterIM*"),							_T("CenterIM"),							_T("ClientIcons_multiproto"),	IDI_CENTERIM,			MULTI_CASE	},
 -	{"client_ChatSecure",		_T("*ChatSecure*"),							_T("ChatSecure"),						_T("ClientIcons_multiproto"),	IDI_CHATSECURE,			MULTI_CASE	},
 -	{"client_Citron",			_T("*Citron*"),								_T("Citron"),							_T("ClientIcons_multiproto"),	IDI_CITRON,				MULTI_CASE	},
 -	{"client_climm",			_T("*climm*"),								_T("climm"),							_T("ClientIcons_multiproto"),	IDI_CLIMM,				MULTI_CASE	},
 -	{"client_Digsby",			_T("*Digsby*"),								_T("Digsby"),							_T("ClientIcons_multiproto"),	IDI_DIGSBY,				MULTI_CASE	},
 -	{"client_EKG2",				_T("*EKG*2*"),								_T("EKG2"),								_T("ClientIcons_multiproto"),	IDI_EKG2,				MULTI_CASE	},
 -	{"client_EasyMessage",		_T("Easy*Message*"),						_T("Easy Message"),						_T("ClientIcons_multiproto"),	IDI_EASYMESSAGE,		MULTI_CASE	},
 -	{"client_Empathy",			_T("*Empathy*"),							_T("Empathy"),							_T("ClientIcons_multiproto"),	IDI_EMPATHY,			MULTI_CASE	},
 -	{"client_Eyeball",			_T("*Eyeball*"),							_T("Eyeball Chat"),						_T("ClientIcons_multiproto"),	IDI_EYEBALL_CHAT,		MULTI_CASE	},
 -	{"client_eBuddy",			_T("|*eBuddy*|*eMessenger*"),				_T("eBuddy Messenger"),					_T("ClientIcons_multiproto"),	IDI_EBUDDY,				MULTI_CASE	},
 -	{"client_eM_Client",		_T("*eM*Client*"),							_T("eM Client"),						_T("ClientIcons_multiproto"),	IDI_EM_CLIENT,			MULTI_CASE	},
 -	{"client_eQo",				_T("*eQo*"),								_T("eQo"),								_T("ClientIcons_multiproto"),	IDI_EQO,				MULTI_CASE	},
 -	{"client_emesene",			_T("*emesene*"),							_T("emesene"),							_T("ClientIcons_multiproto"),	IDI_EMESENE,			MULTI_CASE	},
 -	{"client_FamaIM",			_T("*Fama*"),								_T("FamaIM"),							_T("ClientIcons_multiproto"),	IDI_FAMAIM,				MULTI_CASE	},
 -	{"client_Fring",			_T("*fring*"),								_T("Fring"),							_T("ClientIcons_multiproto"),	IDI_FRING,				MULTI_CASE	},
 -	{"client_GMX",				_T("*GMX*"),								_T("GMX MultiMessenger"),				_T("ClientIcons_multiproto"),	IDI_GMX,				MULTI_CASE	},
 -	{"client_Gaim",				_T("*gaim*"),								_T("Gaim (libgaim)"),					_T("ClientIcons_multiproto"),	IDI_GAIM,				MULTI_CASE	},
 -	{"client_Galaxium",			_T("*Galaxium*"),							_T("Galaxium"),							_T("ClientIcons_multiproto"),	IDI_GALAXIUM,			MULTI_CASE	},
 -	{"client_GnuGadu",			_T("Gnu Gadu*"),							_T("GNU Gadu"),							_T("ClientIcons_multiproto"),	IDI_GNUGADU,			MULTI_CASE	},
 -	{"client_IM2",				_T("*IM2*"),								_T("IM2"),								_T("ClientIcons_multiproto"),	IDI_IM2,				MULTI_CASE	},
 +								_T("|*DdnydQG7RGhP9E3k9Sf+b+bF0zo=*"),		_T("Adium"),							_T("ClientIcons_multiproto"),	IDI_ADIUM,				MULTI_CASE,	TRUE	},
 +	{"client_AgileMessenger",	_T("*Agile Messenger*"),					_T("Agile Messenger"),					_T("ClientIcons_multiproto"),	IDI_AGILE,				MULTI_CASE,	TRUE	},
 +
 +	{"client_Appolo",			_T("*Appolo*"),								_T("Appolo IM"),						_T("ClientIcons_multiproto"),	IDI_APPOLO,				MULTI_CASE,	TRUE	},
 +	{"client_Ayttm",			_T("*Ayttm*"),								_T("Ayttm"),							_T("ClientIcons_multiproto"),	IDI_AYTTM,				MULTI_CASE,	TRUE	},
 +	{"client_BayanICQ",			_T("|*Bayan*ICQ*|*barobin*"),				_T("BayanICQ"),							_T("ClientIcons_multiproto"),	IDI_BAYANICQ,			MULTI_CASE,	TRUE	},
 +	{"client_Beejive",			_T("*Beejive*"),							_T("BeejiveIM"),						_T("ClientIcons_multiproto"),	IDI_BEEJIVE,			MULTI_CASE,	TRUE	},
 +	{"client_Bimoid",			_T("*Bimoid*"),								_T("Bimoid"),							_T("ClientIcons_multiproto"),	IDI_BIMOID,				MULTI_CASE,	TRUE	},
 +	{"client_BitlBee",			_T("*BitlBee*"),							_T("BitlBee"),							_T("ClientIcons_multiproto"),	IDI_BITLBEE,			MULTI_CASE,	TRUE	},
 +	{"client_BlackBerry",		_T("|*Berry*|*ICS?\?\?\?\?\?\?\?"),			_T("BlackBerry"),						_T("ClientIcons_multiproto"),	IDI_BLACKBERRY,			MULTI_CASE,	TRUE	},
 +	{"client_Buddycloud",		_T("*Buddycloud*"),							_T("Buddycloud"),						_T("ClientIcons_multiproto"),	IDI_BUDDYCLOUD,			MULTI_CASE,	TRUE	},
 +	{"client_Carrier",			_T("*Carrier*"),							_T("Carrier client"),					_T("ClientIcons_multiproto"),	IDI_CARRIER,			MULTI_CASE,	TRUE	},
 +	{"client_Causerie",			_T("*Causerie*"),							_T("Causerie"),							_T("ClientIcons_multiproto"),	IDI_CAUSERIE,			MULTI_CASE,	TRUE	},
 +	{"client_CenterIM",			_T("*CenterIM*"),							_T("CenterIM"),							_T("ClientIcons_multiproto"),	IDI_CENTERIM,			MULTI_CASE,	TRUE	},
 +	{"client_ChatSecure",		_T("*ChatSecure*"),							_T("ChatSecure"),						_T("ClientIcons_multiproto"),	IDI_CHATSECURE,			MULTI_CASE,	TRUE	},
 +	{"client_Citron",			_T("*Citron*"),								_T("Citron"),							_T("ClientIcons_multiproto"),	IDI_CITRON,				MULTI_CASE,	TRUE	},
 +	{"client_climm",			_T("*climm*"),								_T("climm"),							_T("ClientIcons_multiproto"),	IDI_CLIMM,				MULTI_CASE,	TRUE	},
 +	{"client_Digsby",			_T("*Digsby*"),								_T("Digsby"),							_T("ClientIcons_multiproto"),	IDI_DIGSBY,				MULTI_CASE,	TRUE	},
 +	{"client_EKG2",				_T("*EKG*2*"),								_T("EKG2"),								_T("ClientIcons_multiproto"),	IDI_EKG2,				MULTI_CASE,	TRUE	},
 +	{"client_EasyMessage",		_T("Easy*Message*"),						_T("Easy Message"),						_T("ClientIcons_multiproto"),	IDI_EASYMESSAGE,		MULTI_CASE,	TRUE	},
 +	{"client_Empathy",			_T("*Empathy*"),							_T("Empathy"),							_T("ClientIcons_multiproto"),	IDI_EMPATHY,			MULTI_CASE,	TRUE	},
 +	{"client_Eyeball",			_T("*Eyeball*"),							_T("Eyeball Chat"),						_T("ClientIcons_multiproto"),	IDI_EYEBALL_CHAT,		MULTI_CASE,	TRUE	},
 +	{"client_eBuddy",			_T("|*eBuddy*|*eMessenger*"),				_T("eBuddy Messenger"),					_T("ClientIcons_multiproto"),	IDI_EBUDDY,				MULTI_CASE,	TRUE	},
 +	{"client_eM_Client",		_T("*eM*Client*"),							_T("eM Client"),						_T("ClientIcons_multiproto"),	IDI_EM_CLIENT,			MULTI_CASE,	TRUE	},
 +	{"client_eQo",				_T("*eQo*"),								_T("eQo"),								_T("ClientIcons_multiproto"),	IDI_EQO,				MULTI_CASE,	TRUE	},
 +	{"client_emesene",			_T("*emesene*"),							_T("emesene"),							_T("ClientIcons_multiproto"),	IDI_EMESENE,			MULTI_CASE,	TRUE	},
 +	{"client_Fama",				_T("*Fama*"),								_T("FamaIM"),							_T("ClientIcons_multiproto"),	IDI_FAMAIM,				MULTI_CASE,	TRUE	},
 +	{"client_Fring",			_T("*fring*"),								_T("Fring"),							_T("ClientIcons_multiproto"),	IDI_FRING,				MULTI_CASE,	TRUE	},
 +	{"client_GMX",				_T("*GMX*"),								_T("GMX MultiMessenger"),				_T("ClientIcons_multiproto"),	IDI_GMX,				MULTI_CASE,	TRUE	},
 +	{"client_Gaim",				_T("*gaim*"),								_T("Gaim (libgaim)"),					_T("ClientIcons_multiproto"),	IDI_GAIM,				MULTI_CASE,	TRUE	},
 +	{"client_Galaxium",			_T("*Galaxium*"),							_T("Galaxium"),							_T("ClientIcons_multiproto"),	IDI_GALAXIUM,			MULTI_CASE,	TRUE	},
 +	{"client_GnuGadu",			_T("Gnu Gadu*"),							_T("GNU Gadu"),							_T("ClientIcons_multiproto"),	IDI_GNUGADU,			MULTI_CASE,	TRUE	},
 +	{"client_IM2",				_T("*IM2*"),								_T("IM2"),								_T("ClientIcons_multiproto"),	IDI_IM2,				MULTI_CASE,	TRUE	},
  	{"client_IMPlus",			_T("|IM+*|IMPLUS*|*IM plus*")
 -								_T("|*+umBU9yx9Cu+R8jvPWIZ3vWD59M=*"),		_T("IM+"),								_T("ClientIcons_multiproto"),	IDI_IMPLUS,				MULTI_CASE	},
 -	{"client_IMVU",				_T("*IMVU*"),								_T("IMVU"),								_T("ClientIcons_multiproto"),	IDI_IMVU,				MULTI_CASE	},
 -	{"client_IMadering",		_T("*IMadering*"),							_T("IMadering"),						_T("ClientIcons_multiproto"),	IDI_IMADERING,			MULTI_CASE	},
 -	{"client_ImoIm",			_T("*imo.im*"),								_T("Imo.im"),							_T("ClientIcons_multiproto"),	IDI_IMOIM,				MULTI_CASE	},
 -	{"client_Inlux",			_T("*Inlux*"),								_T("Inlux Messenger"),					_T("ClientIcons_multiproto"),	IDI_INLUX,				MULTI_CASE	},
 -	{"client_Instantbird",		_T("*Instantbird*"),						_T("Instantbird"),						_T("ClientIcons_multiproto"),	IDI_INSTANTBIRD,		MULTI_CASE	},
 -	{"client_iCall",			_T("*iCall*"),								_T("iCall"),							_T("ClientIcons_multiproto"),	IDI_ICALL,				MULTI_CASE	},
 -	{"client_iChat",			_T("|*iChat*|**imagent*|*iMessages*|"),		_T("iChat"),							_T("ClientIcons_multiproto"),	IDI_ICHAT,				MULTI_CASE	},
 -	{"client_irssi",			_T("*irssi*"),								_T("irssi"),							_T("ClientIcons_multiproto"),	IDI_IRSSI,				MULTI_CASE	},
 -	{"client_JBother",			_T("*JBother*"),							_T("JBother"),							_T("ClientIcons_multiproto"),	IDI_JBOTHER,			MULTI_CASE	},
 -	{"client_JBuddy",			_T("*JBuddy*"),								_T("JBuddy Messenger"),					_T("ClientIcons_multiproto"),	IDI_JBUDDY,				MULTI_CASE	},
 -	{"client_Jabbear",			_T("*Jabbear*"),							_T("Jabbear"),							_T("ClientIcons_multiproto"),	IDI_JABBEAR,			MULTI_CASE	},
 -	{"client_Jabbin",			_T("*Jabbin*"),								_T("Jabbin"),							_T("ClientIcons_multiproto"),	IDI_JABBIN,				MULTI_CASE	},
 -	{"client_Jasmine_IM",		_T("|Jasmine IM*|*jasmineicq.ru/caps*"),	_T("Jasmine IM"),						_T("ClientIcons_multiproto"),	IDI_JASMINEIM,			MULTI_CASE	},
 -	{"client_Jimm",				_T("|*Jimm*|mobicq*"),						_T("Jimm"),								_T("ClientIcons_multiproto"),	IDI_JIMM,				MULTI_CASE	},
 -	{"client_Jimm_Aspro",		_T("*Jimm*Aspro*"),							_T("Jimm Aspro"),						_T("ClientIcons_multiproto"),	IDI_JIMM_ASPRO,			MULTI_CASE	},
 -	{"client_Jimmy",			_T("*Jimmy*"),								_T("JimmyIM"),							_T("ClientIcons_multiproto"),	IDI_JIMMY,				MULTI_CASE	},
 -	{"client_KMess",			_T("*KMess*"),								_T("KMess"),							_T("ClientIcons_multiproto"),	IDI_KMESS,				MULTI_CASE	},
 -	{"client_KoolIM",			_T("*Kool*"),								_T("KoolIM"),							_T("ClientIcons_multiproto"),	IDI_KOOLIM,				MULTI_CASE	},
 -	{"client_Kopete",			_T("*Kopete*"),								_T("Kopete"),							_T("ClientIcons_multiproto"),	IDI_KOPETE,				MULTI_CASE	},
 +								_T("|*+umBU9yx9Cu+R8jvPWIZ3vWD59M=*"),		_T("IM+"),								_T("ClientIcons_multiproto"),	IDI_IMPLUS,				MULTI_CASE,	TRUE	},
 +	{"client_IMVU",				_T("*IMVU*"),								_T("IMVU"),								_T("ClientIcons_multiproto"),	IDI_IMVU,				MULTI_CASE,	TRUE	},
 +	{"client_IMadering",		_T("*IMadering*"),							_T("IMadering"),						_T("ClientIcons_multiproto"),	IDI_IMADERING,			MULTI_CASE,	TRUE	},
 +	{"client_ImoIm",			_T("*imo.im*"),								_T("Imo.im"),							_T("ClientIcons_multiproto"),	IDI_IMOIM,				MULTI_CASE,	TRUE	},
 +	{"client_Inlux",			_T("*Inlux*"),								_T("Inlux Messenger"),					_T("ClientIcons_multiproto"),	IDI_INLUX,				MULTI_CASE,	TRUE	},
 +	{"client_Instantbird",		_T("*Instantbird*"),						_T("Instantbird"),						_T("ClientIcons_multiproto"),	IDI_INSTANTBIRD,		MULTI_CASE,	TRUE	},
 +	{"client_iCall",			_T("*iCall*"),								_T("iCall"),							_T("ClientIcons_multiproto"),	IDI_ICALL,				MULTI_CASE,	TRUE	},
 +	{"client_iChat",			_T("|*iChat*|**imagent*|*iMessages*|"),		_T("iChat"),							_T("ClientIcons_multiproto"),	IDI_ICHAT,				MULTI_CASE,	TRUE	},
 +	{"client_irssi",			_T("*irssi*"),								_T("irssi"),							_T("ClientIcons_multiproto"),	IDI_IRSSI,				MULTI_CASE,	TRUE	},
 +	{"client_JBother",			_T("*JBother*"),							_T("JBother"),							_T("ClientIcons_multiproto"),	IDI_JBOTHER,			MULTI_CASE,	TRUE	},
 +	{"client_JBuddy",			_T("*JBuddy*"),								_T("JBuddy Messenger"),					_T("ClientIcons_multiproto"),	IDI_JBUDDY,				MULTI_CASE,	TRUE	},
 +	{"client_Jabbear",			_T("*Jabbear*"),							_T("Jabbear"),							_T("ClientIcons_multiproto"),	IDI_JABBEAR,			MULTI_CASE,	TRUE	},
 +	{"client_Jabbin",			_T("*Jabbin*"),								_T("Jabbin"),							_T("ClientIcons_multiproto"),	IDI_JABBIN,				MULTI_CASE,	TRUE	},
 +	{"client_Jasmine_IM",		_T("|Jasmine IM*|*jasmineicq.ru/caps*"),	_T("Jasmine IM"),						_T("ClientIcons_multiproto"),	IDI_JASMINEIM,			MULTI_CASE,	TRUE	},
 +
 +	{"client_Jimm_Aspro",		_T("*Jimm*Aspro*"),							_T("Jimm Aspro"),						_T("ClientIcons_multiproto"),	IDI_JIMM_ASPRO,			MULTI_CASE,	TRUE	},
 +	{"client_Jimmy",			_T("*Jimmy*"),								_T("JimmyIM"),							_T("ClientIcons_multiproto"),	IDI_JIMMY,				MULTI_CASE,	TRUE	},
 +
 +	{"client_KMess",			_T("*KMess*"),								_T("KMess"),							_T("ClientIcons_multiproto"),	IDI_KMESS,				MULTI_CASE,	TRUE	},
 +	{"client_KoolIM",			_T("*Kool*"),								_T("KoolIM"),							_T("ClientIcons_multiproto"),	IDI_KOOLIM,				MULTI_CASE,	TRUE	},
 +	{"client_Kopete",			_T("*Kopete*"),								_T("Kopete"),							_T("ClientIcons_multiproto"),	IDI_KOPETE,				MULTI_CASE,	TRUE	},
  	{"client_LeechCraft",		_T("|*LeechCraft*")
 -								_T("|*aNjQWbtza2QtXemMfBS2bwNOtcQ=*"),		_T("LeechCraft"),						_T("ClientIcons_multiproto"),	IDI_LEECHCRAFT,			MULTI_CASE	},
 -	{"client_MDC",				_T("*MDC*"),								_T("MDC"),								_T("ClientIcons_multiproto"),	IDI_MDC,				MULTI_CASE	},
 -	{"client_Meebo",			_T("Meebo*"),								_T("Meebo"),							_T("ClientIcons_multiproto"),	IDI_MEEBO,				MULTI_CASE	},
 -	{"client_Meetro",			_T("Meetro*"),								_T("Meetro"),							_T("ClientIcons_multiproto"),	IDI_MEETRO,				MULTI_CASE	},
 -	{"client_mChat",			_T("|mChat*|gsICQ*|*mchat.mgslab.com*"),	_T("mChat"),							_T("ClientIcons_multiproto"),	IDI_MCHAT,				MULTI_CASE	},
 -	{"client_Nimbuzz",			_T("*Nimbuzz*"),							_T("Nimbuzz"),							_T("ClientIcons_multiproto"),	IDI_NIMBUZZ,			MULTI_CASE	},
 -	{"client_Palringo",			_T("*Palringo*"),							_T("Palringo"),							_T("ClientIcons_multiproto"),	IDI_PALRINGO,			MULTI_CASE	},
 -
 -	{"client_Pigeon",			_T("*PIGEON*"),								_T("PIGEON!"),							_T("ClientIcons_multiproto"),	IDI_PIGEON,				MULTI_CASE	},
 -	{"client_PlayXpert",		_T("*PlayXpert*"),							_T("PlayXpert"),						_T("ClientIcons_multiproto"),	IDI_PLAYXPERT,			MULTI_CASE	},
 -	{"client_Prelude",			_T("*Prelude*"),							_T("Prelude"),							_T("ClientIcons_multiproto"),	IDI_PRELUDE,			MULTI_CASE	},
 -	{"client_Proteus",			_T("*Proteus*"),							_T("Proteus"),							_T("ClientIcons_multiproto"),	IDI_PROTEUS,			MULTI_CASE	},
 +								_T("|*aNjQWbtza2QtXemMfBS2bwNOtcQ=*"),		_T("LeechCraft"),						_T("ClientIcons_multiproto"),	IDI_LEECHCRAFT,			MULTI_CASE,	TRUE	},
 +	{"client_MDC",				_T("*MDC*"),								_T("MDC"),								_T("ClientIcons_multiproto"),	IDI_MDC,				MULTI_CASE,	TRUE	},
 +	{"client_Meebo",			_T("Meebo*"),								_T("Meebo"),							_T("ClientIcons_multiproto"),	IDI_MEEBO,				MULTI_CASE,	TRUE	},
 +	{"client_Meetro",			_T("Meetro*"),								_T("Meetro"),							_T("ClientIcons_multiproto"),	IDI_MEETRO,				MULTI_CASE,	TRUE	},
 +	{"client_mChat",			_T("|mChat*|gsICQ*|*mchat.mgslab.com*"),	_T("mChat"),							_T("ClientIcons_multiproto"),	IDI_MCHAT,				MULTI_CASE,	TRUE	},
 +	{"client_Nimbuzz",			_T("*Nimbuzz*"),							_T("Nimbuzz"),							_T("ClientIcons_multiproto"),	IDI_NIMBUZZ,			MULTI_CASE,	TRUE	},
 +	{"client_Palringo",			_T("*Palringo*"),							_T("Palringo"),							_T("ClientIcons_multiproto"),	IDI_PALRINGO,			MULTI_CASE,	TRUE	},
 +
 +	{"client_Pigeon",			_T("*PIGEON*"),								_T("PIGEON!"),							_T("ClientIcons_multiproto"),	IDI_PIGEON,				MULTI_CASE,	TRUE	},
 +	{"client_PlayXpert",		_T("*PlayXpert*"),							_T("PlayXpert"),						_T("ClientIcons_multiproto"),	IDI_PLAYXPERT,			MULTI_CASE,	TRUE	},
 +	{"client_Prelude",			_T("*Prelude*"),							_T("Prelude"),							_T("ClientIcons_multiproto"),	IDI_PRELUDE,			MULTI_CASE,	TRUE	},
 +	{"client_Proteus",			_T("*Proteus*"),							_T("Proteus"),							_T("ClientIcons_multiproto"),	IDI_PROTEUS,			MULTI_CASE,	TRUE	},
  	{"client_Python",			_T("|Py*t|*Python*"),						_T("Python transport clients"),			_T("ClientIcons_multiproto"),	IDI_PYTHON,				MULTI_CASE	},
  	{"client_QIP_Android",		_T("QIP *Android*"),						_T("QIP Mobile Android"),				_T("ClientIcons_multiproto"),	IDI_QIP_ANDROID,		MULTI_CASE,	TRUE	},
 @@ -152,82 +155,56 @@ KN_FP_MASK def_kn_fp_mask[] =  	{"client_QIP_2010",			_T("|QIP 2010*|http://2010.qip.ru*"),		_T("QIP 2010"),							_T("ClientIcons_multiproto"),	IDI_QIP_2010,			MULTI_CASE,	TRUE	},
  	{"client_QIP_Infium",		_T("|QIP Infium*|http://*qip*"),			_T("QIP Infium"),						_T("ClientIcons_multiproto"),	IDI_QIP_INFIUM,			MULTI_CASE,	TRUE	},
 -	{"client_Qnext",			_T("QNext*"),								_T("Qnext"),							_T("ClientIcons_multiproto"),	IDI_QNEXT,				MULTI_CASE	},
 -	{"client_qutIM",			_T("*qutIM*"),								_T("qutIM"),							_T("ClientIcons_multiproto"),	IDI_QUTIM,				MULTI_CASE	},
 -	{"client_mqutIM",			_T("*mqutIM*"),								_T("mqutIM"),							_T("ClientIcons_multiproto"),	IDI_MQUTIM,				MULTI_CASE	},
 -	{"client_SAPO",				_T("*SAPO*"),								_T("SAPO Messenger"),					_T("ClientIcons_multiproto"),	IDI_SAPO,				MULTI_CASE	},
 -	{"client_SIM",				_T("|^*Simp*|*SIM*"),						_T("SIM"),								_T("ClientIcons_multiproto"),	IDI_SIM,				MULTI_CASE	},
 -	{"client_Salut_a_Toi",		_T("*Salut*Toi*"),							_T("Salut a Toi"),						_T("ClientIcons_multiproto"),	IDI_SALUT_A_TOI,		MULTI_CASE	},
 -	{"client_Shaim",			_T("*Shaim*"),								_T("Shaim"),							_T("ClientIcons_multiproto"),	IDI_SHAIM,				MULTI_CASE	},
 -	{"client_SieJC",			_T("|SieJC*|NatICQ*|Siemens*Client*"),		_T("Siemens ICQ / Jabber client"),		_T("ClientIcons_multiproto"),	IDI_SIEJC,				MULTI_CASE	},
 -	{"client_Slick",			_T("Slick*"),								_T("Slick"),							_T("ClientIcons_multiproto"),	IDI_SLICK,				MULTI_CASE	},
 -	{"client_SrevIM",			_T("*Srev*IM*"),							_T("SrevIM"),							_T("ClientIcons_multiproto"),	IDI_SREVIM,				MULTI_CASE	},
 -
 -	{"client_Tril_Android",		_T("*Trillian*Android*"),					_T("Trillian Android"),					_T("ClientIcons_multiproto"),	IDI_TRILLIAN_ANDROID,	MULTI_CASE	},
 -	{"client_Tril_Astra",		_T("Trillian*Astra*"),						_T("Trillian Astra"),					_T("ClientIcons_multiproto"),	IDI_TRILLIAN_ASTRA,		MULTI_CASE	},
 -	{"client_Trillian_Pro",		_T("Trillian*Pro*"),						_T("Trillian Pro"),						_T("ClientIcons_multiproto"),	IDI_TRILLIAN_PRO,		MULTI_CASE	},
 -	{"client_Trillian",			_T("*Trillian**"),							_T("Trillian"),							_T("ClientIcons_multiproto"),	IDI_TRILLIAN,			MULTI_CASE,		TRUE	},
 -
 -	{"client_Tuukle_Chat",		_T("*Tuukle*Chat*|*IM*Gate*"),				_T("Tuukle Chat"),						_T("ClientIcons_multiproto"),	IDI_TUUKLE_CHAT,		MULTI_CASE	},
 -	{"client_vBuzzer",			_T("*vBuzzer*"),							_T("vBuzzer"),							_T("ClientIcons_multiproto"),	IDI_VBUZZER,			MULTI_CASE	},
 -	{"client_Virtus",			_T("*Virtus*"),								_T("Virtus"),							_T("ClientIcons_multiproto"),	IDI_VIRTUS,				MULTI_CASE	},
 -	{"client_uIM",				_T("*uIM*"),								_T("uIM"),								_T("ClientIcons_multiproto"),	IDI_UIM,				MULTI_CASE	},
 -	{"client_uTalk",			_T("*uTalk*"),								_T("uTalk"),							_T("ClientIcons_multiproto"),	IDI_UTALK,				MULTI_CASE	},
 -	{"client_WeeChat",			_T("*WeeChat*"),							_T("WeeChat"),							_T("ClientIcons_multiproto"),	IDI_WEECHAT,			MULTI_CASE	},
 -	{"client_Wippien",			_T("*Wippien*"),							_T("Wippien"),							_T("ClientIcons_multiproto"),	IDI_WIPPIEN,			MULTI_CASE	},
 -	{"client_YamiGo",			_T("YamiGo*"),								_T("YamiGo"),							_T("ClientIcons_multiproto"),	IDI_YAMIGO,				MULTI_CASE	},
 -	{"client_Yeigo",			_T("*Yeigo*"),								_T("Yeigo"),							_T("ClientIcons_multiproto"),	IDI_YEIGO,				MULTI_CASE	},
 -	{"client_Yoono",			_T("*Yoono*"),								_T("Yoono"),							_T("ClientIcons_multiproto"),	IDI_YOONO,				MULTI_CASE	},
 +	{"client_Qnext",			_T("Qnext*"),								_T("Qnext"),							_T("ClientIcons_multiproto"),	IDI_QNEXT,				MULTI_CASE,	TRUE	},
 +	{"client_qutIM",			_T("*qutIM*"),								_T("qutIM"),							_T("ClientIcons_multiproto"),	IDI_QUTIM,				MULTI_CASE,	TRUE	},
 +	{"client_mqutIM",			_T("*mqutIM*"),								_T("mqutIM"),							_T("ClientIcons_multiproto"),	IDI_MQUTIM,				MULTI_CASE,	TRUE	},
 +	{"client_SAPO",				_T("*SAPO*"),								_T("SAPO Messenger"),					_T("ClientIcons_multiproto"),	IDI_SAPO,				MULTI_CASE,	TRUE	},
 +	{"client_SIM",				_T("|^*Simp*|*SIM*"),						_T("SIM"),								_T("ClientIcons_multiproto"),	IDI_SIM,				MULTI_CASE,	TRUE	},
 +	{"client_Salut_a_Toi",		_T("*Salut*Toi*"),							_T("Salut a Toi"),						_T("ClientIcons_multiproto"),	IDI_SALUT_A_TOI,		MULTI_CASE,	TRUE	},
 +	{"client_Shaim",			_T("*Shaim*"),								_T("Shaim"),							_T("ClientIcons_multiproto"),	IDI_SHAIM,				MULTI_CASE,	TRUE	},
 +	{"client_SieJC",			_T("|SieJC*|Nat*ICQ*|Siemens*Client*"),		_T("Siemens ICQ / Jabber client"),		_T("ClientIcons_multiproto"),	IDI_SIEJC,				MULTI_CASE,	TRUE	},
 +	{"client_Slick",			_T("Slick*"),								_T("Slick"),							_T("ClientIcons_multiproto"),	IDI_SLICK,				MULTI_CASE,	TRUE	},
 +	{"client_SrevIM",			_T("*Srev*IM*"),							_T("SrevIM"),							_T("ClientIcons_multiproto"),	IDI_SREVIM,				MULTI_CASE,	TRUE	},
 +
 +	{"client_Tril_Android",		_T("*Trillian*Android*"),					_T("Trillian Android"),					_T("ClientIcons_multiproto"),	IDI_TRILLIAN_ANDROID,	MULTI_CASE,	TRUE	},
 +	{"client_Tril_Astra",		_T("Trillian*Astra*"),						_T("Trillian Astra"),					_T("ClientIcons_multiproto"),	IDI_TRILLIAN_ASTRA,		MULTI_CASE,	TRUE	},
 +	{"client_Trillian_Pro",		_T("Trillian*Pro*"),						_T("Trillian Pro"),						_T("ClientIcons_multiproto"),	IDI_TRILLIAN_PRO,		MULTI_CASE,	TRUE	},
 +	{"client_Trillian",			_T("*Trillian**"),							_T("Trillian"),							_T("ClientIcons_multiproto"),	IDI_TRILLIAN,			MULTI_CASE,	TRUE	},
 +
 +	{"client_Tuukle_Chat",		_T("*Tuukle*Chat*|*IM*Gate*"),				_T("Tuukle Chat"),						_T("ClientIcons_multiproto"),	IDI_TUUKLE_CHAT,		MULTI_CASE,	TRUE	},
 +	{"client_vBuzzer",			_T("*vBuzzer*"),							_T("vBuzzer"),							_T("ClientIcons_multiproto"),	IDI_VBUZZER,			MULTI_CASE,	TRUE	},
 +	{"client_Virtus",			_T("*Virtus*"),								_T("Virtus"),							_T("ClientIcons_multiproto"),	IDI_VIRTUS,				MULTI_CASE,	TRUE	},
 +	{"client_uIM",				_T("*uIM*"),								_T("uIM"),								_T("ClientIcons_multiproto"),	IDI_UIM,				MULTI_CASE,	TRUE	},
 +	{"client_uTalk",			_T("*uTalk*"),								_T("uTalk"),							_T("ClientIcons_multiproto"),	IDI_UTALK,				MULTI_CASE,	TRUE	},
 +	{"client_WeeChat",			_T("*WeeChat*"),							_T("WeeChat"),							_T("ClientIcons_multiproto"),	IDI_WEECHAT,			MULTI_CASE,	TRUE	},
 +	{"client_Wippien",			_T("*Wippien*"),							_T("Wippien"),							_T("ClientIcons_multiproto"),	IDI_WIPPIEN,			MULTI_CASE,	TRUE	},
 +
 +	{"client_YamiGo",			_T("YamiGo*"),								_T("YamiGo"),							_T("ClientIcons_multiproto"),	IDI_YAMIGO,				MULTI_CASE,	TRUE	},
 +	{"client_Yeigo",			_T("*Yeigo*"),								_T("Yeigo"),							_T("ClientIcons_multiproto"),	IDI_YEIGO,				MULTI_CASE,	TRUE	},
 +	{"client_Yoono",			_T("*Yoono*"),								_T("Yoono"),							_T("ClientIcons_multiproto"),	IDI_YOONO,				MULTI_CASE,	TRUE	},
  //###########################################################################################################################################################################################################
  //#################################		ICQ		#############################################################################################################################################################
  //###########################################################################################################################################################################################################
 -	{"client_&RQ",				_T("&RQ*"),									_T("&RQ"),								_T("ClientIcons_ICQ"),			IDI_ANDRQ,				ICQ_CASE	},
 -	{"client_R&Q",				_T("R&Q*"),									_T("R&Q"),								_T("ClientIcons_ICQ"),			IDI_RANDQ_NEW,			ICQ_CASE	},
 -
 -	{"client_1und1",			_T("|*Pocket*Web*|*1&1*|*1*?nd*1"),			_T("1&1"),								_T("ClientIcons_ICQ"),			IDI_1UND1,				ICQ_CASE	},
 -	{"client_Anastasia",		_T("Anastasia*"),							_T("Anastasia"),						_T("ClientIcons_ICQ"),			IDI_ANASTASIA,			ICQ_CASE	},
 -	{"client_Asia",				_T("*Asia*"),								_T("Asia"),								_T("ClientIcons_ICQ"),			IDI_ASIA,				ICQ_CASE	},
 -	{"client_CenterICQ",		_T("*Centericq*"),							_T("CenterICQ"),						_T("ClientIcons_ICQ"),			IDI_CENTERICQ,			ICQ_CASE	},
 -	{"client_Corepager",		_T("Core*Pager*"),							_T("Core Pager"),						_T("ClientIcons_ICQ"),			IDI_COREPAGER,			ICQ_CASE	},
 -	{"client_D[i]Chat",			_T("D[i]Chat*"),							_T("D[i]Chat"),							_T("ClientIcons_ICQ"),			IDI_DICHAT,				ICQ_CASE	},
 -	{"client_GlICQ",			_T("GlICQ*"),								_T("GlICQ"),							_T("ClientIcons_ICQ"),			IDI_GLICQ,				ICQ_CASE	},
 -	{"client_GnomeICU",			_T("GnomeICU*"),							_T("GnomeICU"),							_T("ClientIcons_ICQ"),			IDI_GNOMEICU,			ICQ_CASE	},
 -	{"client_ICQ_2X",			_T("ICQ*2.x*"),								_T("ICQ 2.x"),							_T("ClientIcons_ICQ"),			IDI_ICQ2X,				ICQ_CASE	},
 -	{"client_Icy_Juice",		_T("*Icy*Juice*"),							_T("Icy Juice"),						_T("ClientIcons_ICQ"),			IDI_ICY_JUICE,			ICQ_CASE	},
 -	{"client_JICQ",				_T("*JICQ*"),								_T("JICQ"),								_T("ClientIcons_ICQ"),			IDI_JICQ,				ICQ_CASE	},
 -	{"client_Licq",				_T("Licq*"),								_T("Licq"),								_T("ClientIcons_ICQ"),			IDI_LICQ,				ICQ_CASE	},
 -	{"client_LocID",			_T("LocID*"),								_T("LocID"),							_T("ClientIcons_ICQ"),			IDI_LOCID,				ICQ_CASE	},
 -	{"client_MIP",				_T("*MIP*"),								_T("MIP"),								_T("ClientIcons_ICQ"),			IDI_MIP,				ICQ_CASE	},
 -	{"client_NanoICQ",			_T("*Nano*ICQ*"),							_T("NanoICQ"),							_T("ClientIcons_ICQ"),			IDI_NANOICQ,			ICQ_CASE	},
 -	{"client_ICAT",				_T("IC@*"),									_T("IC@"),								_T("ClientIcons_ICQ"),			IDI_ICAT,				ICQ_CASE	},
 -	{"client_QIP",				_T("QIP*"),									_T("QIP"),								_T("ClientIcons_ICQ"),			IDI_QIP,				ICQ_CASE,	TRUE	},
 -	{"client_Smaper",			_T("*SmapeR*"),								_T("SmapeR"),							_T("ClientIcons_ICQ"),			IDI_SMAPER,				ICQ_CASE	},
 -	{"client_SmartICQ",			_T("SmartICQ*"),							_T("SmartICQ (via mIRC)"),				_T("ClientIcons_ICQ"),			IDI_SMARTICQ,			ICQ_CASE	},
 -	{"client_SpamBot",			_T("*Spam*Bot*"),							_T("Spam Bot"),							_T("ClientIcons_ICQ"),			IDI_SPAMBOT,			ICQ_CASE	},
 -	{"client_Sticq",			_T("stICQ*"),								_T("stICQ"),							_T("ClientIcons_ICQ"),			IDI_STICQ,				ICQ_CASE	},
 -	{"client_StrICQ",			_T("StrICQ*"),								_T("StrICQ"),							_T("ClientIcons_ICQ"),			IDI_STRICQ,				ICQ_CASE	},
 -	{"client_TICQ",				_T("*TICQ*Client*"),						_T("TICQ (Delphi lib)"),				_T("ClientIcons_ICQ"),			IDI_TICQ,				ICQ_CASE	},
 -	{"client_Virus",			_T("*Virus*"),								_T("Virus (Stration worm)"),			_T("ClientIcons_ICQ"),			IDI_VIRUS,				ICQ_CASE	},
 -	{"client_VmICQ",			_T("VmICQ*"),								_T("VmICQ"),							_T("ClientIcons_ICQ"),			IDI_VMICQ,				ICQ_CASE	},
 -	{"client_WebICQ",			_T("WebICQ*"),								_T("WebICQ"),							_T("ClientIcons_ICQ"),			IDI_WEBICQ,				ICQ_CASE	},
 -	{"client_YSM",				_T("YSM*"),									_T("YSM"),								_T("ClientIcons_ICQ"),			IDI_YSM,				ICQ_CASE	},
 -	{"client_Yeemp",			_T("Yeemp*"),								_T("Yeemp"),							_T("ClientIcons_ICQ"),			IDI_YEEMP,				ICQ_CASE	},
 -	{"client_alicq",			_T("alicq*"),								_T("Alicq"),							_T("ClientIcons_ICQ"),			IDI_ALICQ,				ICQ_CASE	},
 -	{"client_kxICQ",			_T("kxICQ*"),								_T("KxICQ2"),							_T("ClientIcons_ICQ"),			IDI_KXICQ,				ICQ_CASE	},
 -	{"client_libicq2k",			_T("libicq2*"),								_T("LibICQ/JIT"),						_T("ClientIcons_ICQ"),			IDI_LIBICQ2000,			ICQ_CASE	},
 -	{"client_mICQ",				_T("mICQ*"),								_T("mICQ"),								_T("ClientIcons_ICQ"),			IDI_MICQ,				ICQ_CASE	},
 -	{"client_vICQ",				_T("vICQ*"),								_T("vICQ"),								_T("ClientIcons_ICQ"),			IDI_VICQ,				ICQ_CASE	},
 -	{"client_SpamBot",			_T("*Spam*Bot*"),							_T("Spam Bot"),							_T("ClientIcons_ICQ"),			IDI_SPAMBOT,			ICQ_CASE	},
 -	{"client_Virus",			_T("*Virus*"),								_T("Virus (Stration worm"),				_T("ClientIcons_ICQ"),			IDI_VIRUS,				ICQ_CASE	},
 -
 -//###########################################################################################################################################################################################################
 -//#################################		OFFICIAL ICQ	#####################################################################################################################################################
 -//###########################################################################################################################################################################################################
 -	{"client_ICQ_all",			_T("|ICQ *|ICQ2*"),							_T("ICQ official"),						_T("ClientIcons_ICQ"),			IDI_ICQ,				ICQ_OFFICIAL_CASE	},
 +	{"client_D[i]Chat",			_T("D[i]Chat*"),							_T("D[i]Chat"),							_T("ClientIcons_ICQ"),			IDI_DICHAT,				ICQ_CASE,	TRUE	},
 +	{"client_GnomeICU",			_T("GnomeICU*"),							_T("GnomeICU"),							_T("ClientIcons_ICQ"),			IDI_GNOMEICU,			ICQ_CASE,	TRUE	},
 +	{"client_Icy_Juice",		_T("*Icy*Juice*"),							_T("Icy Juice"),						_T("ClientIcons_ICQ"),			IDI_ICY_JUICE,			ICQ_CASE,	TRUE	},
 +	{"client_Jimm",				_T("|*Jimm*|mobicq*"),						_T("Jimm"),								_T("ClientIcons_ICQ"),			IDI_JIMM,				ICQ_CASE,	TRUE	},
 +	{"client_Licq",				_T("Licq*"),								_T("Licq"),								_T("ClientIcons_ICQ"),			IDI_LICQ,				ICQ_CASE,	TRUE	},
 +	{"client_LocID",			_T("LocID*"),								_T("LocID"),							_T("ClientIcons_ICQ"),			IDI_LOCID,				ICQ_CASE,	TRUE	},
 +	{"client_QIP_2005",			_T("QIP*2005*"),							_T("QIP 2005"),							_T("ClientIcons_ICQ"),			IDI_QIP_2005,			ICQ_CASE,	TRUE	},
 +	{"client_R&Q",				_T("R&Q*"),									_T("R&Q"),								_T("ClientIcons_ICQ"),			IDI_RANDQ,				ICQ_CASE,	TRUE	},
 +	{"client_SmartICQ",			_T("Smart*ICQ*"),							_T("SmartICQ"),							_T("ClientIcons_ICQ"),			IDI_SMARTICQ,			ICQ_CASE,	TRUE	},
 +	{"client_StrICQ",			_T("StrICQ*"),								_T("StrICQ"),							_T("ClientIcons_ICQ"),			IDI_STRICQ,				ICQ_CASE,	TRUE	},
 +
 +	{"client_spam",				_T("*spam*"),								_T("spam client"),						_T("ClientIcons_ICQ"),			IDI_SPAM,				ICQ_CASE,	TRUE	},
 +	{"client_libicq2k",			_T("libicq*"),								_T("LibICQ/JIT"),						_T("ClientIcons_ICQ"),			IDI_LIBICQ2000,			ICQ_CASE,	TRUE	},
 +	{"client_TICQClient",		_T("*TICQ*Client*"),						_T("TICQClient (Delphi lib)"),			_T("ClientIcons_ICQ"),			IDI_TICQ,				ICQ_CASE,	TRUE	},
 +
 +	{"client_ICQ_all",			_T("|ICQ *|ICQ2*"),							_T("ICQ official client"),				_T("ClientIcons_ICQ"),			IDI_ICQ,				ICQ_CASE	},
  //	AIM detection in ICQ protocol clutch, actually are mobile clients
 -	{"client_AIM",				_T("AIM"),									_T("AIM-based client"),					_T("ClientIcons_ICQ"),			IDI_AIM,				ICQ_OFFICIAL_CASE,	TRUE	},
 +//	{"client_AIM",				_T("AIM"),									_T("AIM-based client"),					_T("ClientIcons_ICQ"),			IDI_AIM_7,				ICQ_CASE,	TRUE	},
  //###########################################################################################################################################################################################################
  //#################################		JABBER		#########################################################################################################################################################
 @@ -267,7 +244,7 @@ KN_FP_MASK def_kn_fp_mask[] =  	{"client_Emacs",			_T("|*Jabber.el*|*Emacs*"),					_T("Emacs (Jabber.el)"),				_T("ClientIcons_Jabber"),		IDI_EMACS,				JABBER_CASE	},
  	{"client_Exodus",			_T("*Exodus*"),								_T("Exodus"),							_T("ClientIcons_Jabber"),		IDI_EXODUS,				JABBER_CASE	},
  	{"client_Facebook",			_T("*Facebook*"),							_T("Facebook"),							_T("ClientIcons_Jabber"),		IDI_FACEBOOK,			JABBER_CASE	},
 -	{"client_Fire",				_T("*Fire*"),								_T("Fire"),								_T("ClientIcons_Jabber"),		IDI_FIRE,				JABBER_CASE	},
 +	{"client_Fire",				_T("Fire*"),								_T("Fire"),								_T("ClientIcons_Jabber"),		IDI_FIRE,				JABBER_CASE	},
  	{"client_GCN",				_T("*GCN*"),								_T("GCN"),								_T("ClientIcons_Jabber"),		IDI_GCN,				JABBER_CASE	},
  	{"client_GMail",			_T("|*gmail.*|GMail*"),						_T("GMail"),							_T("ClientIcons_Jabber"),		IDI_GMAIL,				JABBER_CASE	},
  	{"client_GOIM",				_T("*GOIM*"),								_T("GOIM"),								_T("ClientIcons_Jabber"),		IDI_GOIM,				JABBER_CASE	},
 @@ -452,99 +429,99 @@ KN_FP_MASK def_kn_fp_mask[] =  //###########################################################################################################################################################################################################
  //#################################		IRC		#############################################################################################################################################################
  //###########################################################################################################################################################################################################
 -	{"client_AmIRC",			_T("*AmIRC*"),								_T("AmIRC"),							_T("ClientIcons_IRC"),			IDI_AMIRC,				IRC_CASE	},
 -	{"client_Babbel",			_T("*Babbel*"),								_T("Babbel"),							_T("ClientIcons_IRC"),			IDI_BABBEL,				IRC_CASE	},
 -	{"client_BersIRC",			_T("*BersIRC*"),							_T("BersIRC"),							_T("ClientIcons_IRC"),			IDI_BERSIRC,			IRC_CASE	},
 -	{"client_ChatZilla",		_T("*ChatZilla*"),							_T("ChatZilla"),						_T("ClientIcons_IRC"),			IDI_CHATZILLA,			IRC_CASE	},
 -	{"client_Conversation",		_T("*Conversation*"),						_T("Conversation"),						_T("ClientIcons_IRC"),			IDI_CONVERSATION,		IRC_CASE	},
 -	{"client_Eggdrop",			_T("*Eggdrop*"),							_T("Eggdrop"),							_T("ClientIcons_IRC"),			IDI_EGGDROP,			IRC_CASE	},
 -	{"client_EggdropRacBot",	_T("*Eggdrop*RacBot*"),						_T("Eggdrop RacBot"),					_T("ClientIcons_IRC"),			IDI_EGGDROP_RACBOT,		IRC_CASE	},
 -	{"client_FChat",			_T("*FChat*"),								_T("FChat"),							_T("ClientIcons_IRC"),			IDI_FCHAT,				IRC_CASE	},
 -	{"client_GDPChat",			_T("*GDPChat*"),							_T("GDP Web Chat"),						_T("ClientIcons_IRC"),			IDI_GDPCHAT,			IRC_CASE	},
 -	{"client_GoPowerTools",		_T("*Go*PowerTools*"),						_T("GoPowerTools"),						_T("ClientIcons_IRC"),			IDI_GOPOWERTOOLS,		IRC_CASE	},
 -	{"client_HydraIRC",			_T("*Hydra*IRC*"),							_T("HydraIRC"),							_T("ClientIcons_IRC"),			IDI_HYDRA_IRC,			IRC_CASE	},
 -	{"client_IRCXpro",			_T("*IRCXpro*"),							_T("IRCXpro"),							_T("ClientIcons_IRC"),			IDI_IRCXPRO,			IRC_CASE	},
 -	{"client_IceChat",			_T("*Ice*Chat*"),							_T("IceChat"),							_T("ClientIcons_IRC"),			IDI_ICECHAT,			IRC_CASE	},
 -	{"client_KSirc",			_T("*ksirk*"),								_T("KSirc"),							_T("ClientIcons_IRC"),			IDI_KSIRC,				IRC_CASE	},
 -	{"client_KVIrc",			_T("*KVIrc*"),								_T("KVIrc"),							_T("ClientIcons_IRC"),			IDI_KVIRC,				IRC_CASE	},
 -	{"client_Klient",			_T("*Klient*"),								_T("Klient"),							_T("ClientIcons_IRC"),			IDI_KLIENT,				IRC_CASE	},
 -	{"client_Konversation",		_T("*Konversation*"),						_T("Konversation"),						_T("ClientIcons_IRC"),			IDI_KONVERSATION,		IRC_CASE	},
 -	{"client_MP3Script",		_T("*MP3*Script*"),							_T("MP3 Script for mIRC"),				_T("ClientIcons_IRC"),			IDI_MP3_SCRIPT,			IRC_CASE	},
 -	{"client_NeoRaTrion",		_T("*NeoRa*Trion*"),						_T("NeoRa Trion"),						_T("ClientIcons_IRC"),			IDI_NEORATRION,			IRC_CASE	},
 -	{"client_Nettalk",			_T("*Nettalk*"),							_T("Nettalk"),							_T("ClientIcons_IRC"),			IDI_NETTALK,			IRC_CASE	},
 -	{"client_NoNameScript",		_T("*NoName*Script*"),						_T("NoNameScript"),						_T("ClientIcons_IRC"),			IDI_NONAME_SCRIPT,		IRC_CASE	},
 -	{"client_Opera",			_T("*Opera*"),								_T("Opera"),							_T("ClientIcons_IRC"),			IDI_OPERA,				IRC_CASE	},
 -	{"client_PJIRC",			_T("*PJIRC*"),								_T("PJIRC"),							_T("ClientIcons_IRC"),			IDI_PJIRC,				IRC_CASE	},
 -	{"client_Pirch",			_T("*Pirch*"),								_T("Pirch"),							_T("ClientIcons_IRC"),			IDI_PIRCH,				IRC_CASE	},
 -	{"client_PocketIRC",		_T("*Pocket*IRC*"),							_T("Pocket IRC"),						_T("ClientIcons_IRC"),			IDI_POCKET_IRC,			IRC_CASE	},
 -	{"client_ProChat",			_T("*Pro*Chat*"),							_T("ProChat"),							_T("ClientIcons_IRC"),			IDI_PROCHAT,			IRC_CASE	},
 -	{"client_SmartIRC",			_T("*Smart*IRC*"),							_T("SmartIRC"),							_T("ClientIcons_IRC"),			IDI_SMART_IRC,			IRC_CASE	},
 -	{"client_Snak",				_T("*Snak*"),								_T("Snak"),								_T("ClientIcons_IRC"),			IDI_SNAK,				IRC_CASE	},
 -	{"client_SysReset",			_T("*Sys*Reset*"),							_T("SysReset"),							_T("ClientIcons_IRC"),			IDI_SYSRESET,			IRC_CASE	},
 -	{"client_VircaIRC",			_T("*VircaIRC*"),							_T("VircaIRC"),							_T("ClientIcons_IRC"),			IDI_VIRCAIRC,			IRC_CASE	},
 -	{"client_VisionIRC",		_T("*VisionIRC*"),							_T("VisionIRC"),						_T("ClientIcons_IRC"),			IDI_VISIONIRC,			IRC_CASE	},
 -	{"client_VisualIRC",		_T("*VisualIRC*"),							_T("VisualIRC"),						_T("ClientIcons_IRC"),			IDI_VISUALIRC,			IRC_CASE	},
 -	{"client_VortecIRC",		_T("*VortecIRC*"),							_T("VortecIRC"),						_T("ClientIcons_IRC"),			IDI_VORTECIRC,			IRC_CASE	},
 -	{"client_WLIrc",			_T("*WLIrc*"),								_T("WLIrc"),							_T("ClientIcons_IRC"),			IDI_WLIRC,				IRC_CASE	},
 -	{"client_XChatAqua",		_T("*X*Chat*Aqua*"),						_T("X-Chat Aqua"),						_T("ClientIcons_IRC"),			IDI_XCHATAQUA,			IRC_CASE	},
 -	{"client_XiRCON",			_T("*XiRCON*"),								_T("XiRCON"),							_T("ClientIcons_IRC"),			IDI_XIRCON,				IRC_CASE	},
 -	{"client_Xirc",				_T("*Xirc*"),								_T("Xirc"),								_T("ClientIcons_IRC"),			IDI_XIRC,				IRC_CASE	},
 -	{"client_ZipTorrent",		_T("*ZipTorrent*"),							_T("ZipTorrent"),						_T("ClientIcons_IRC"),			IDI_ZIPTORRENT,			IRC_CASE	},
 -	{"client_aMule",			_T("*aMule*"),								_T("aMule"),							_T("ClientIcons_IRC"),			IDI_AMULE,				IRC_CASE	},
 -	{"client_cbirc",			_T("*cbirc*"),								_T("cbirc"),							_T("ClientIcons_IRC"),			IDI_CBIRC,				IRC_CASE	},
 -	{"client_dIRC",				_T("*dIRC*"),								_T("dIRC"),								_T("ClientIcons_IRC"),			IDI_DIRC,				IRC_CASE	},
 -
 -	{"client_ircle",			_T("*ircle*"),								_T("ircle"),							_T("ClientIcons_IRC"),			IDI_IRCLE,				IRC_CASE	},
 -	{"client_jircii",			_T("*jircii*"),								_T("jircii"),							_T("ClientIcons_IRC"),			IDI_JIRCII,				IRC_CASE	},
 -	{"client_jmIrc",			_T("*jmIrc*"),								_T("jmIrc"),							_T("ClientIcons_IRC"),			IDI_JMIRC,				IRC_CASE	},
 -	{"client_mIRC",				_T("*mIRC*"),								_T("mIRC"),								_T("ClientIcons_IRC"),			IDI_MIRC,				IRC_CASE	},
 -	{"client_pIRC",				_T("*pIRC*"),								_T("pIRC"),								_T("ClientIcons_IRC"),			IDI_PIRC,				IRC_CASE	},
 -	{"client_piorun",			_T("*piorun*"),								_T("Piorun"),							_T("ClientIcons_IRC"),			IDI_PIORUN,				IRC_CASE	},
 -	{"client_psyBNC",			_T("*psyBNC*"),								_T("psyBNC"),							_T("ClientIcons_IRC"),			IDI_PSYBNC,				IRC_CASE	},
 -	{"client_savIRC",			_T("*savIRC*"),								_T("savIRC"),							_T("ClientIcons_IRC"),			IDI_SAVIRC,				IRC_CASE	},
 -	{"client_wmIRC",			_T("*wmIRC*"),								_T("wmIRC"),							_T("ClientIcons_IRC"),			IDI_WMIRC,				IRC_CASE	},
 -	{"client_xBitch",			_T("*xBitch*"),								_T("xBitch"),							_T("ClientIcons_IRC"),			IDI_XBITCH,				IRC_CASE	},
 -	{"client_xChat",			_T("*xChat*"),								_T("xChat"),							_T("ClientIcons_IRC"),			IDI_XCHAT,				IRC_CASE	},
 -	{"client_zsIRC",			_T("*zsIRC*"),								_T("zsIRC"),							_T("ClientIcons_IRC"),			IDI_ZSIRC,				IRC_CASE	},
 -
 -	{"client_eMuleMorphXT",		_T("eMule*MorphXT*"),						_T("eMule MorphXT"),					_T("ClientIcons_IRC"),			IDI_EMULE_MORPHXT,		IRC_CASE	},
 -	{"client_eMuleNeo",			_T("eMule*Neo*"),							_T("eMule Neo"),						_T("ClientIcons_IRC"),			IDI_EMULE_NEO,			IRC_CASE	},
 -	{"client_eMulePlus",		_T("|eMule*plus*|eMule*+*"),				_T("eMule+"),							_T("ClientIcons_IRC"),			IDI_EMULE_PLUS,			IRC_CASE	},
 -	{"client_eMuleXtreme",		_T("eMule*Xtreme*"),						_T("eMule Xtreme"),						_T("ClientIcons_IRC"),			IDI_EMULE_XTREME,		IRC_CASE	},
 -	{"client_eMule",			_T("*eMule*"),								_T("eMule"),							_T("ClientIcons_IRC"),			IDI_EMULE,				IRC_CASE	},
 -
 -	{"client_IRCUnknown",		_T("*IRC*"),								_T("Unknown IRC client"),				_T("ClientIcons_IRC"),			IDI_IRC_UNKNOWN,		IRC_CASE	},
 +	{"client_AmIRC",			_T("*AmIRC*"),								_T("AmIRC"),							_T("ClientIcons_IRC"),			IDI_AMIRC,				IRC_CASE,	TRUE	},
 +	{"client_Babbel",			_T("*Babbel*"),								_T("Babbel"),							_T("ClientIcons_IRC"),			IDI_BABBEL,				IRC_CASE,	TRUE	},
 +	{"client_BersIRC",			_T("*BersIRC*"),							_T("BersIRC"),							_T("ClientIcons_IRC"),			IDI_BERSIRC,			IRC_CASE,	TRUE	},
 +	{"client_ChatZilla",		_T("*ChatZilla*"),							_T("ChatZilla"),						_T("ClientIcons_IRC"),			IDI_CHATZILLA,			IRC_CASE,	TRUE	},
 +	{"client_Conversation",		_T("*Conversation*"),						_T("Conversation"),						_T("ClientIcons_IRC"),			IDI_CONVERSATION,		IRC_CASE,	TRUE	},
 +	{"client_Eggdrop",			_T("*Eggdrop*"),							_T("Eggdrop"),							_T("ClientIcons_IRC"),			IDI_EGGDROP,			IRC_CASE,	TRUE	},
 +	{"client_EggdropRacBot",	_T("*Eggdrop*RacBot*"),						_T("Eggdrop RacBot"),					_T("ClientIcons_IRC"),			IDI_EGGDROP_RACBOT,		IRC_CASE,	TRUE	},
 +	{"client_FChat",			_T("*FChat*"),								_T("FChat"),							_T("ClientIcons_IRC"),			IDI_FCHAT,				IRC_CASE,	TRUE	},
 +	{"client_GDPChat",			_T("*GDPChat*"),							_T("GDP Web Chat"),						_T("ClientIcons_IRC"),			IDI_GDPCHAT,			IRC_CASE,	TRUE	},
 +	{"client_GoPowerTools",		_T("*Go*PowerTools*"),						_T("GoPowerTools"),						_T("ClientIcons_IRC"),			IDI_GOPOWERTOOLS,		IRC_CASE,	TRUE	},
 +	{"client_HydraIRC",			_T("*Hydra*IRC*"),							_T("HydraIRC"),							_T("ClientIcons_IRC"),			IDI_HYDRA_IRC,			IRC_CASE,	TRUE	},
 +	{"client_IRCXpro",			_T("*IRCXpro*"),							_T("IRCXpro"),							_T("ClientIcons_IRC"),			IDI_IRCXPRO,			IRC_CASE,	TRUE	},
 +	{"client_IceChat",			_T("*Ice*Chat*"),							_T("IceChat"),							_T("ClientIcons_IRC"),			IDI_ICECHAT,			IRC_CASE,	TRUE	},
 +	{"client_KSirc",			_T("*ksirk*"),								_T("KSirc"),							_T("ClientIcons_IRC"),			IDI_KSIRC,				IRC_CASE,	TRUE	},
 +	{"client_KVIrc",			_T("*KVIrc*"),								_T("KVIrc"),							_T("ClientIcons_IRC"),			IDI_KVIRC,				IRC_CASE,	TRUE	},
 +	{"client_Klient",			_T("*Klient*"),								_T("Klient"),							_T("ClientIcons_IRC"),			IDI_KLIENT,				IRC_CASE,	TRUE	},
 +	{"client_Konversation",		_T("*Konversation*"),						_T("Konversation"),						_T("ClientIcons_IRC"),			IDI_KONVERSATION,		IRC_CASE,	TRUE	},
 +	{"client_MP3Script",		_T("*MP3*Script*"),							_T("MP3 Script for mIRC"),				_T("ClientIcons_IRC"),			IDI_MP3_SCRIPT,			IRC_CASE,	TRUE	},
 +	{"client_NeoRaTrion",		_T("*NeoRa*Trion*"),						_T("NeoRa Trion"),						_T("ClientIcons_IRC"),			IDI_NEORATRION,			IRC_CASE,	TRUE	},
 +	{"client_Nettalk",			_T("*Nettalk*"),							_T("Nettalk"),							_T("ClientIcons_IRC"),			IDI_NETTALK,			IRC_CASE,	TRUE	},
 +	{"client_NoNameScript",		_T("*NoName*Script*"),						_T("NoNameScript"),						_T("ClientIcons_IRC"),			IDI_NONAME_SCRIPT,		IRC_CASE,	TRUE	},
 +	{"client_Opera",			_T("*Opera*"),								_T("Opera"),							_T("ClientIcons_IRC"),			IDI_OPERA,				IRC_CASE,	TRUE	},
 +	{"client_PJIRC",			_T("*PJIRC*"),								_T("PJIRC"),							_T("ClientIcons_IRC"),			IDI_PJIRC,				IRC_CASE,	TRUE	},
 +	{"client_Pirch",			_T("*Pirch*"),								_T("Pirch"),							_T("ClientIcons_IRC"),			IDI_PIRCH,				IRC_CASE,	TRUE	},
 +	{"client_PocketIRC",		_T("*Pocket*IRC*"),							_T("Pocket IRC"),						_T("ClientIcons_IRC"),			IDI_POCKET_IRC,			IRC_CASE,	TRUE	},
 +	{"client_ProChat",			_T("*Pro*Chat*"),							_T("ProChat"),							_T("ClientIcons_IRC"),			IDI_PROCHAT,			IRC_CASE,	TRUE	},
 +	{"client_SmartIRC",			_T("*Smart*IRC*"),							_T("SmartIRC"),							_T("ClientIcons_IRC"),			IDI_SMART_IRC,			IRC_CASE,	TRUE	},
 +	{"client_Snak",				_T("*Snak*"),								_T("Snak"),								_T("ClientIcons_IRC"),			IDI_SNAK,				IRC_CASE,	TRUE	},
 +	{"client_SysReset",			_T("*Sys*Reset*"),							_T("SysReset"),							_T("ClientIcons_IRC"),			IDI_SYSRESET,			IRC_CASE,	TRUE	},
 +	{"client_VircaIRC",			_T("*VircaIRC*"),							_T("VircaIRC"),							_T("ClientIcons_IRC"),			IDI_VIRCAIRC,			IRC_CASE,	TRUE	},
 +	{"client_VisionIRC",		_T("*VisionIRC*"),							_T("VisionIRC"),						_T("ClientIcons_IRC"),			IDI_VISIONIRC,			IRC_CASE,	TRUE	},
 +	{"client_VisualIRC",		_T("*VisualIRC*"),							_T("VisualIRC"),						_T("ClientIcons_IRC"),			IDI_VISUALIRC,			IRC_CASE,	TRUE	},
 +	{"client_VortecIRC",		_T("*VortecIRC*"),							_T("VortecIRC"),						_T("ClientIcons_IRC"),			IDI_VORTECIRC,			IRC_CASE,	TRUE	},
 +	{"client_WLIrc",			_T("*WLIrc*"),								_T("WLIrc"),							_T("ClientIcons_IRC"),			IDI_WLIRC,				IRC_CASE,	TRUE	},
 +	{"client_XChatAqua",		_T("*X*Chat*Aqua*"),						_T("X-Chat Aqua"),						_T("ClientIcons_IRC"),			IDI_XCHATAQUA,			IRC_CASE,	TRUE	},
 +	{"client_XiRCON",			_T("*XiRCON*"),								_T("XiRCON"),							_T("ClientIcons_IRC"),			IDI_XIRCON,				IRC_CASE,	TRUE	},
 +	{"client_Xirc",				_T("*Xirc*"),								_T("Xirc"),								_T("ClientIcons_IRC"),			IDI_XIRC,				IRC_CASE,	TRUE	},
 +	{"client_ZipTorrent",		_T("*ZipTorrent*"),							_T("ZipTorrent"),						_T("ClientIcons_IRC"),			IDI_ZIPTORRENT,			IRC_CASE,	TRUE	},
 +	{"client_aMule",			_T("*aMule*"),								_T("aMule"),							_T("ClientIcons_IRC"),			IDI_AMULE,				IRC_CASE,	TRUE	},
 +	{"client_cbirc",			_T("*cbirc*"),								_T("cbirc"),							_T("ClientIcons_IRC"),			IDI_CBIRC,				IRC_CASE,	TRUE	},
 +	{"client_dIRC",				_T("*dIRC*"),								_T("dIRC"),								_T("ClientIcons_IRC"),			IDI_DIRC,				IRC_CASE,	TRUE	},
 +
 +	{"client_ircle",			_T("*ircle*"),								_T("ircle"),							_T("ClientIcons_IRC"),			IDI_IRCLE,				IRC_CASE,	TRUE	},
 +	{"client_jircii",			_T("*jircii*"),								_T("jircii"),							_T("ClientIcons_IRC"),			IDI_JIRCII,				IRC_CASE,	TRUE	},
 +	{"client_jmIrc",			_T("*jmIrc*"),								_T("jmIrc"),							_T("ClientIcons_IRC"),			IDI_JMIRC,				IRC_CASE,	TRUE	},
 +	{"client_mIRC",				_T("*mIRC*"),								_T("mIRC"),								_T("ClientIcons_IRC"),			IDI_MIRC,				IRC_CASE,	TRUE	},
 +	{"client_pIRC",				_T("*pIRC*"),								_T("pIRC"),								_T("ClientIcons_IRC"),			IDI_PIRC,				IRC_CASE,	TRUE	},
 +	{"client_piorun",			_T("*piorun*"),								_T("Piorun"),							_T("ClientIcons_IRC"),			IDI_PIORUN,				IRC_CASE,	TRUE	},
 +	{"client_psyBNC",			_T("*psyBNC*"),								_T("psyBNC"),							_T("ClientIcons_IRC"),			IDI_PSYBNC,				IRC_CASE,	TRUE	},
 +	{"client_savIRC",			_T("*savIRC*"),								_T("savIRC"),							_T("ClientIcons_IRC"),			IDI_SAVIRC,				IRC_CASE,	TRUE	},
 +	{"client_wmIRC",			_T("*wmIRC*"),								_T("wmIRC"),							_T("ClientIcons_IRC"),			IDI_WMIRC,				IRC_CASE,	TRUE	},
 +	{"client_xBitch",			_T("*xBitch*"),								_T("xBitch"),							_T("ClientIcons_IRC"),			IDI_XBITCH,				IRC_CASE,	TRUE	},
 +	{"client_xChat",			_T("*xChat*"),								_T("xChat"),							_T("ClientIcons_IRC"),			IDI_XCHAT,				IRC_CASE,	TRUE	},
 +	{"client_zsIRC",			_T("*zsIRC*"),								_T("zsIRC"),							_T("ClientIcons_IRC"),			IDI_ZSIRC,				IRC_CASE,	TRUE	},
 +
 +	{"client_eMuleMorphXT",		_T("eMule*MorphXT*"),						_T("eMule MorphXT"),					_T("ClientIcons_IRC"),			IDI_EMULE_MORPHXT,		IRC_CASE,	TRUE	},
 +	{"client_eMuleNeo",			_T("eMule*Neo*"),							_T("eMule Neo"),						_T("ClientIcons_IRC"),			IDI_EMULE_NEO,			IRC_CASE,	TRUE	},
 +	{"client_eMulePlus",		_T("|eMule*plus*|eMule*+*"),				_T("eMule+"),							_T("ClientIcons_IRC"),			IDI_EMULE_PLUS,			IRC_CASE,	TRUE	},
 +	{"client_eMuleXtreme",		_T("eMule*Xtreme*"),						_T("eMule Xtreme"),						_T("ClientIcons_IRC"),			IDI_EMULE_XTREME,		IRC_CASE,	TRUE	},
 +	{"client_eMule",			_T("*eMule*"),								_T("eMule"),							_T("ClientIcons_IRC"),			IDI_EMULE,				IRC_CASE,	TRUE	},
 +
 +	{"client_IRCUnknown",		_T("*IRC*"),								_T("Unknown IRC client"),				_T("ClientIcons_IRC"),			IDI_IRC_UNKNOWN,		IRC_CASE,	TRUE	},
  //###########################################################################################################################################################################################################
  //#################################		MSN		#############################################################################################################################################################
  //###########################################################################################################################################################################################################
 -	{"client_WLM11",			_T("WLM*2011*"),							_T("Windows Live 11"),					_T("ClientIcons_MSN"),			IDI_WLM_10,				MSN_CASE	},
 -	{"client_WLM10",			_T("WLM*2010*"),							_T("Windows Live 10"),					_T("ClientIcons_MSN"),			IDI_WLM_10,				MSN_CASE	},
 -	{"client_WLM9",				_T("WLM*9*"),								_T("Windows Live v9.x"),				_T("ClientIcons_MSN"),			IDI_WLM_9,				MSN_CASE	},
 -	{"client_MSN8",				_T("|WLM*8.*|MSN*8.*"),						_T("Windows Live v8.x"),				_T("ClientIcons_MSN"),			IDI_MSN_8,				MSN_CASE	},
 -	{"client_MSN7x",			_T("MSN*7.*"),								_T("MSN Messenger v7.x"),				_T("ClientIcons_MSN"),			IDI_MSN_7,				MSN_CASE	},
 -	{"client_MSN6x",			_T("MSN*6.*"),								_T("MSN Messenger v6.x"),				_T("ClientIcons_MSN"),			IDI_MSN_6,				MSN_CASE	},
 -	{"client_MSN45",			_T("MSN*4.x-5.x"),							_T("MSN Messenger v4.x-5.x"),			_T("ClientIcons_MSN"),			IDI_MSN_45,				MSN_CASE	},
 -	{"client_MSN4Mac",			_T("MSN*Mac*"),								_T("MSN for Mac"),						_T("ClientIcons_MSN"),			IDI_MSN_MAC,			MSN_CASE	},
 -	{"client_aMSN",				_T("*aMSN*"),								_T("aMSN"),								_T("ClientIcons_MSN"),			IDI_AMSN,				MSN_CASE	},
 -	{"client_MSN_Web",			_T("WebMessenger*"),						_T("WebMessenger"),						_T("ClientIcons_MSN"),			IDI_WEBMESSENGER,		MSN_CASE	},
 +	{"client_WLM11",			_T("WLM*2011*"),							_T("Windows Live 11"),					_T("ClientIcons_MSN"),			IDI_WLM_10,				MSN_CASE,	TRUE	},
 +	{"client_WLM10",			_T("WLM*2010*"),							_T("Windows Live 10"),					_T("ClientIcons_MSN"),			IDI_WLM_10,				MSN_CASE,	TRUE	},
 +	{"client_WLM9",				_T("WLM*9*"),								_T("Windows Live v9.x"),				_T("ClientIcons_MSN"),			IDI_WLM_9,				MSN_CASE,	TRUE	},
 +	{"client_MSN8",				_T("|WLM*8.*|MSN*8.*"),						_T("Windows Live v8.x"),				_T("ClientIcons_MSN"),			IDI_MSN_8,				MSN_CASE,	TRUE	},
 +	{"client_MSN7x",			_T("MSN*7.*"),								_T("MSN Messenger v7.x"),				_T("ClientIcons_MSN"),			IDI_MSN_7,				MSN_CASE,	TRUE	},
 +	{"client_MSN6x",			_T("MSN*6.*"),								_T("MSN Messenger v6.x"),				_T("ClientIcons_MSN"),			IDI_MSN_6,				MSN_CASE,	TRUE	},
 +	{"client_MSN45",			_T("MSN*4.x-5.x"),							_T("MSN Messenger v4.x-5.x"),			_T("ClientIcons_MSN"),			IDI_MSN_45,				MSN_CASE,	TRUE	},
 +	{"client_MSN4Mac",			_T("MSN*Mac*"),								_T("MSN for Mac"),						_T("ClientIcons_MSN"),			IDI_MSN_MAC,			MSN_CASE,	TRUE	},
 +	{"client_aMSN",				_T("*aMSN*"),								_T("aMSN"),								_T("ClientIcons_MSN"),			IDI_AMSN,				MSN_CASE,	TRUE	},
 +	{"client_MSN_Web",			_T("WebMessenger*"),						_T("WebMessenger"),						_T("ClientIcons_MSN"),			IDI_WEBMESSENGER,		MSN_CASE,	TRUE	},
  	{"client_MSN",				_T("|WLM*|MSN*|Windows Live*"),				_T("MSN"),								_T("ClientIcons_MSN"),			IDI_MSN,				MSN_CASE,	TRUE	},
  //###########################################################################################################################################################################################################
  //#################################		AIM		#############################################################################################################################################################
  //###########################################################################################################################################################################################################
 -	{"client_Aim7",				_T("AIM*7.*"),								_T("AIM v7.x"),							_T("ClientIcons_AIM"),	 		IDI_AIM_7,				AIM_CASE	},
 -	{"client_Aim6",				_T("AIM*6.*"),								_T("AIM v6.x"),							_T("ClientIcons_AIM"),	 		IDI_AIM_6,				AIM_CASE	},
 -	{"client_Aim5",				_T("AIM*5.*"),								_T("AIM v5.x"),							_T("ClientIcons_AIM"),	 		IDI_AIM_5,				AIM_CASE	},
 -	{"client_Aim4",				_T("AIM*4.*"),								_T("AIM v4.x"),							_T("ClientIcons_AIM"),	 		IDI_AIM_4,				AIM_CASE	},
 +	{"client_Aim7",				_T("AIM*7.*"),								_T("AIM v7.x"),							_T("ClientIcons_AIM"),	 		IDI_AIM_7,				AIM_CASE,	TRUE	},
 +	{"client_Aim6",				_T("AIM*6.*"),								_T("AIM v6.x"),							_T("ClientIcons_AIM"),	 		IDI_AIM_6,				AIM_CASE,	TRUE	},
 +	{"client_Aim5",				_T("AIM*5.*"),								_T("AIM v5.x"),							_T("ClientIcons_AIM"),	 		IDI_AIM_5,				AIM_CASE,	TRUE	},
 +	{"client_Aim4",				_T("AIM*4.*"),								_T("AIM v4.x"),							_T("ClientIcons_AIM"),	 		IDI_AIM_4,				AIM_CASE,	TRUE	},
 -	{"client_AIM_Triton",		_T("*AIM*Triton*"),							_T("AIM Triton"),						_T("ClientIcons_AIM"),	 		IDI_AIM_TRITON,			AIM_CASE	},
 -	{"client_AimMac",			_T("AIM*Mac*"),								_T("AIM for MacOS"),					_T("ClientIcons_AIM"),	 		IDI_AIM_MAC,			AIM_CASE	},
 -	{"client_AimMobile",		_T("|AIM*Mobile*|AIM*gprs*|Aim*sms*"),		_T("AIM Mobile"),						_T("ClientIcons_AIM"),	 		IDI_AIM_MOBILE,			AIM_CASE	},
 -	{"client_Naim",				_T("*naim*"),								_T("Naim"),								_T("ClientIcons_AIM"),	 		IDI_NAIM,				AIM_CASE	},
 -	{"client_miniaim",			_T("*miniaim*"),							_T("miniaim"),							_T("ClientIcons_AIM"),	 		IDI_MINIAIM,			AIM_CASE	},
 -	{"client_TerraIM",			_T("*Terra*"),								_T("TerraIM"),							_T("ClientIcons_AIM"),	 		IDI_TERRAIM,			AIM_CASE	},
 -	{"client_AIM",				_T("AIM*"),									_T("AIM"),								_T("ClientIcons_AIM"),	 		IDI_AIM,				AIM_CASE	},
 +	{"client_AIM_Triton",		_T("*AIM*Triton*"),							_T("AIM Triton"),						_T("ClientIcons_AIM"),	 		IDI_AIM_TRITON,			AIM_CASE,	TRUE	},
 +	{"client_AimMac",			_T("AIM*Mac*"),								_T("AIM for MacOS"),					_T("ClientIcons_AIM"),	 		IDI_AIM_MAC,			AIM_CASE,	TRUE	},
 +	{"client_AimMobile",		_T("|AIM*Mobile*|AIM*gprs*|Aim*sms*"),		_T("AIM Mobile"),						_T("ClientIcons_AIM"),	 		IDI_AIM_MOBILE,			AIM_CASE,	TRUE	},
 +	{"client_Naim",				_T("*naim*"),								_T("Naim"),								_T("ClientIcons_AIM"),	 		IDI_NAIM,				AIM_CASE,	TRUE	},
 +	{"client_miniaim",			_T("*miniaim*"),							_T("miniaim"),							_T("ClientIcons_AIM"),	 		IDI_MINIAIM,			AIM_CASE,	TRUE	},
 +	{"client_TerraIM",			_T("*Terra*"),								_T("TerraIM"),							_T("ClientIcons_AIM"),	 		IDI_TERRAIM,			AIM_CASE,	TRUE	},
 +	{"client_AIM",				_T("AIM*"),									_T("AIM"),								_T("ClientIcons_AIM"),	 		IDI_AIM_7,				AIM_CASE,	TRUE	},
  //###########################################################################################################################################################################################################
  //#################################		YAHOO	#############################################################################################################################################################
 @@ -555,29 +532,29 @@ KN_FP_MASK def_kn_fp_mask[] =  	{"client_Yahoo7",			_T("*Yahoo*7*"),							_T("Yahoo v7.x"),						_T("ClientIcons_Yahoo"),		IDI_YAHOO7,				YAHOO_CASE	},
  	{"client_Yahoo6",			_T("*Yahoo*6*"),							_T("Yahoo v6.x"),						_T("ClientIcons_Yahoo"),		IDI_YAHOO6,				YAHOO_CASE	},
  	{"client_Yahoo5",			_T("*Yahoo*5*"),							_T("Yahoo v5.x"),						_T("ClientIcons_Yahoo"),		IDI_YAHOO5,				YAHOO_CASE	},
 -	{"client_YahGoMobile",		_T("|Yahoo*Go*|Yahoo*Mobile*"),				_T("Yahoo! Go Mobile"),					_T("ClientIcons_Yahoo"),		IDI_YAHOO_GO_MOBILE,	YAHOO_CASE	},
 -	{"client_PingBox",			_T("*Yahoo*PingBox*"),						_T("Yahoo PingBox"),					_T("ClientIcons_Yahoo"),		IDI_PINGBOX,			YAHOO_CASE	},
 -	{"client_YahooWeb",			_T("*Yahoo*Web*Messenger"),					_T("Yahoo Web Messenger"),				_T("ClientIcons_Yahoo"),		IDI_YAHOO10,			YAHOO_CASE	},
 -	{"client_libyahoo2",		_T("*libyahoo*"),							_T("libyahoo2"),						_T("ClientIcons_Yahoo"),		IDI_LIBYAHOO2,			YAHOO_CASE	},
 +	{"client_YahGoMobile",		_T("|Yahoo*Go*|Yahoo*Mobile*"),				_T("Yahoo! Go Mobile"),					_T("ClientIcons_Yahoo"),		IDI_YAHOO_GO_MOBILE,	YAHOO_CASE,	TRUE	},
 +	{"client_PingBox",			_T("*Yahoo*PingBox*"),						_T("Yahoo PingBox"),					_T("ClientIcons_Yahoo"),		IDI_PINGBOX,			YAHOO_CASE,	TRUE	},
 +	{"client_YahooWeb",			_T("*Yahoo*Web*Messenger"),					_T("Yahoo Web Messenger"),				_T("ClientIcons_Yahoo"),		IDI_YAHOO10,			YAHOO_CASE,	TRUE	},
 +	{"client_libyahoo2",		_T("*libyahoo*"),							_T("libyahoo2"),						_T("ClientIcons_Yahoo"),		IDI_LIBYAHOO2,			YAHOO_CASE,	TRUE	},
  	{"client_Yahoo",			_T("*Yahoo*"),								_T("Yahoo"),							_T("ClientIcons_Yahoo"),		IDI_YAHOO,				YAHOO_CASE	},
  //###########################################################################################################################################################################################################
  //#################################		GADU-GADU 	#########################################################################################################################################################
  //###########################################################################################################################################################################################################
 -	{"client_Gadu_Gadu_7",		_T("Gadu-Gadu*7*"),							_T("Gadu-Gadu v7.x"),					_T("ClientIcons_Gadu"),			IDI_GADU_GADU_7,		GG_CASE	},
 -	{"client_Gadu_Gadu_6",		_T("Gadu-Gadu*6*"),							_T("Gadu-Gadu v6.x"),					_T("ClientIcons_Gadu"),			IDI_GADU_GADU_6,		GG_CASE	},
 +	{"client_Gadu_Gadu_7",		_T("Gadu-Gadu*7*"),							_T("Gadu-Gadu v7.x"),					_T("ClientIcons_Gadu"),			IDI_GADU_GADU_7,		GG_CASE,	TRUE	},
 +	{"client_Gadu_Gadu_6",		_T("Gadu-Gadu*6*"),							_T("Gadu-Gadu v6.x"),					_T("ClientIcons_Gadu"),			IDI_GADU_GADU_6,		GG_CASE,	TRUE	},
  //###########################################################################################################################################################################################################
  //#################################		MAIL.RU 	#########################################################################################################################################################
  //###########################################################################################################################################################################################################
  	{"client_MRA_official",		_T("|magent*|Mail.ru Agent*official*")
  								_T("|Mail.ru Agent*PC*")
 -								_T("|http://agent.mail.ru*"),				_T("Mail.Ru Agent (official)"),			_T("ClientIcons_MRA"),	 		IDI_MAIL_RU_OFFICIAL,	MRA_CASE	},
 +								_T("|http://agent.mail.ru*"),				_T("Mail.Ru Agent (official)"),			_T("ClientIcons_MRA"),	 		IDI_MAIL_RU_OFFICIAL,	MRA_CASE,	TRUE	},
  	{"client_MRA_Mobile",		_T("|wmagent*|MobileAgent*")
  								_T("|sagent*|Mail.ru Agent*Symbian*")
 -								_T("|jagent*"),								_T("Mail.Ru Mobile Agent"),				_T("ClientIcons_MRA"),	 		IDI_MAIL_RU_MOBILE,		MRA_CASE	},
 -	{"client_MRA_web",			_T("Web Agent*"),							_T("Mail.Ru Web Agent"),				_T("ClientIcons_MRA"),	 		IDI_MAIL_RU_WEBAGENT,	MRA_CASE	},
 -	{"client_MRA_unknown",		_T("Mail.ru Agent*"),						_T("Mail.Ru (unknown client)"),			_T("ClientIcons_MRA"),	 		IDI_MAIL_RU_UNKNOWN,	MRA_CASE	},
 +								_T("|jagent*"),								_T("Mail.Ru Mobile Agent"),				_T("ClientIcons_MRA"),	 		IDI_MAIL_RU_MOBILE,		MRA_CASE,	TRUE	},
 +	{"client_MRA_web",			_T("Web Agent*"),							_T("Mail.Ru Web Agent"),				_T("ClientIcons_MRA"),	 		IDI_MAIL_RU_WEBAGENT,	MRA_CASE,	TRUE	},
 +	{"client_MRA_unknown",		_T("Mail.ru Agent*"),						_T("Mail.Ru (unknown client)"),			_T("ClientIcons_MRA"),	 		IDI_MAIL_RU_UNKNOWN,	MRA_CASE,	TRUE	},
  //###########################################################################################################################################################################################################
  //#################################		OTHER CLIENTS	#####################################################################################################################################################
 @@ -585,7 +562,9 @@ KN_FP_MASK def_kn_fp_mask[] =  	{"client_Android",			_T("*Android*"),							_T("Android"),							_T("ClientIcons_multiproto"),	IDI_ANDROID,			MULTI_CASE,	TRUE	},
  	{"client_Pidgin",			_T("|*Pidgin*|*libpurple*|Purple*"),		_T("Pidgin (libpurple)"),				_T("ClientIcons_multiproto"),	IDI_PIDGIN,				MULTI_CASE	},
 -	{"client_Skype",			_T("*Skype**"),								_T("Skype client"),						_T("ClientIcons_Others"),		IDI_SKYPE,				OTHER_PROTOS_CASE	},
 +	{"client_Skype",			_T("*Skype**"),								_T("Skype client"),						_T("ClientIcons_Others"),		IDI_SKYPE,				OTHER_PROTOS_CASE,	TRUE	},
 +
 +	{"client_Xfire",			_T("*Xfire*"),								_T("Xfire"),							_T("ClientIcons_multiproto"),	IDI_XFIRE,				OTHER_PROTOS_CASE,	TRUE	},
  //###########################################################################################################################################################################################################
  //#################################		WEATHER		#########################################################################################################################################################
 @@ -607,19 +586,19 @@ KN_FP_MASK def_kn_fp_mask[] =  //###########################################################################################################################################################################################################
  //#################################		RSS		#############################################################################################################################################################
  //###########################################################################################################################################################################################################
 -	{"client_rss09x",			_T("*RSS*0.9*"),							_T("RSS 0.9x"),							_T("ClientIcons_RSS"),			IDI_RSS09,				RSS_CASE	},
 -	{"client_rss2",				_T("*RSS*2.*"),								_T("RSS 2"),							_T("ClientIcons_RSS"),			IDI_RSS2,				RSS_CASE	},
 -	{"client_rss1",				_T("*RSS*1.*"),								_T("RSS 1"),							_T("ClientIcons_RSS"),			IDI_RSS1,				RSS_CASE	},
 -	{"client_atom3",			_T("*Atom*3.*"),							_T("Atom 3"),							_T("ClientIcons_RSS"),			IDI_ATOM3,				RSS_CASE	},
 -	{"client_atom1",			_T("*Atom*1.*"),							_T("Atom 1"),							_T("ClientIcons_RSS"),			IDI_ATOM1,				RSS_CASE	},
 +	{"client_rss09x",			_T("*RSS*0.9*"),							_T("RSS 0.9x"),							_T("ClientIcons_RSS"),			IDI_RSS09,				RSS_CASE,	TRUE	},
 +	{"client_rss2",				_T("*RSS*2.*"),								_T("RSS 2"),							_T("ClientIcons_RSS"),			IDI_RSS2,				RSS_CASE,	TRUE	},
 +	{"client_rss1",				_T("*RSS*1.*"),								_T("RSS 1"),							_T("ClientIcons_RSS"),			IDI_RSS1,				RSS_CASE,	TRUE	},
 +	{"client_atom3",			_T("*Atom*3.*"),							_T("Atom 3"),							_T("ClientIcons_RSS"),			IDI_ATOM3,				RSS_CASE,	TRUE	},
 +	{"client_atom1",			_T("*Atom*1.*"),							_T("Atom 1"),							_T("ClientIcons_RSS"),			IDI_ATOM1,				RSS_CASE,	TRUE	},
  //###########################################################################################################################################################################################################
  //#################################		QQ		#############################################################################################################################################################
  //###########################################################################################################################################################################################################
 -	{"client_MobileQQ",			_T("|Mobile*QQ*|iPhone*QQ*|QQ WAP*"),		_T("Mobile QQ"),						_T("ClientIcons_QQ"),			IDI_MOBILEQQ,			QQ_CASE	},
 -	{"client_QQConcept",		_T("QQ*Concept*"),							_T("QQ Concept"),						_T("ClientIcons_QQ"),			IDI_QQCONCEPT,			QQ_CASE	},
 -	{"client_QQCRM",			_T("QQ*CRM*"),								_T("QQ CRM"),							_T("ClientIcons_QQ"),			IDI_QQCRM,				QQ_CASE	},
 -	{"client_QQSilver",			_T("QQ*Silverlight*"),						_T("QQ Silverlight"),					_T("ClientIcons_QQ"),			IDI_QQSILVER,			QQ_CASE	},
 +	{"client_MobileQQ",			_T("|Mobile*QQ*|iPhone*QQ*|QQ WAP*"),		_T("Mobile QQ"),						_T("ClientIcons_QQ"),			IDI_MOBILEQQ,			QQ_CASE,	TRUE	},
 +	{"client_QQConcept",		_T("QQ*Concept*"),							_T("QQ Concept"),						_T("ClientIcons_QQ"),			IDI_QQCONCEPT,			QQ_CASE,	TRUE	},
 +	{"client_QQCRM",			_T("QQ*CRM*"),								_T("QQ CRM"),							_T("ClientIcons_QQ"),			IDI_QQCRM,				QQ_CASE,	TRUE	},
 +	{"client_QQSilver",			_T("QQ*Silverlight*"),						_T("QQ Silverlight"),					_T("ClientIcons_QQ"),			IDI_QQSILVER,			QQ_CASE,	TRUE	},
  	{"client_TM2008",			_T("|TM2008*|TM2009*|TM2010*"),				_T("TM 2008 and >"),					_T("ClientIcons_QQ"),			IDI_TM2008,				QQ_CASE	},
  	{"client_TM",				_T("TM*"),									_T("TM"),								_T("ClientIcons_QQ"),			IDI_TM,					QQ_CASE	},
  	{"client_QQInt",			_T("QQ*International*"),					_T("QQ International"),					_T("ClientIcons_QQ"),			IDI_QQINT,				QQ_CASE	},
 @@ -692,18 +671,18 @@ KN_FP_MASK def_kn_fp_overlays_mask[] =  //###########################################################################################################################################################################################################
  //#################################		PROTO OVERLAYS		#################################################################################################################################################
  //###########################################################################################################################################################################################################
 -	{"client_AIM_over",			_T("*AIM*"),								_T("AIM overlay"),						_T("ClientIcons_overlays"),		IDI_AIMOSCAR_OVERLAY,	OVERLAYS_PROTO_CASE	},	//FIX
 +	{"client_AIM_overlay",		_T("*AIM*"),								_T("AIM overlay"),						_T("ClientIcons_overlays"),		IDI_AIMOSCAR_OVERLAY,	OVERLAYS_PROTO_CASE	},	//FIX
  	{"client_ICQJ_Plus_over",	_T("*ICQ*Plus*"),							_T("ICQJ Plus Mod overlay"),			_T("ClientIcons_overlays"),		IDI_ICQJ_PLUS_OVERLAY,	OVERLAYS_PROTO_CASE	},
 -	{"client_ICQJ_over",		_T("|^ICQ*|*ICQ*"),							_T("ICQJ overlay"),						_T("ClientIcons_overlays"),		IDI_ICQJ_OVERLAY,		OVERLAYS_PROTO_CASE	},
 -	{"client_IRC_over",			_T("Miranda*IRC*"),							_T("IRC overlay"),						_T("ClientIcons_overlays"),		IDI_IRC_OVERLAY,		OVERLAYS_PROTO_CASE	},
 -	{"client_JGmail_over",		_T("*JGmail*"),								_T("JGmail overlay"),					_T("ClientIcons_overlays"),		IDI_GMAIL_OVERLAY,		OVERLAYS_PROTO_CASE	},
 -	{"client_JGTalk_over",		_T("*JGTalk*"),								_T("JGTalk overlay"),					_T("ClientIcons_overlays"),		IDI_JGTALK_OVERLAY,		OVERLAYS_PROTO_CASE	},
 -	{"client_Jabber_over",		_T("|Miranda*Jabber*|*t Jabber*"),			_T("Jabber overlay"),					_T("ClientIcons_overlays"),		IDI_JABBER_OVERLAY,		OVERLAYS_PROTO_CASE	},
 -	{"client_MailRu_over",		_T("|*Mail.ru*IM*|*MRA*"),					_T("Mail.Ru Agent overlay"),			_T("ClientIcons_overlays"),		IDI_MAILRU_OVERLAY,		OVERLAYS_PROTO_CASE	},
 -	{"client_MSN_over",			_T("Miranda*MSN*"),							_T("MSN overlay"),						_T("ClientIcons_overlays"),		IDI_MSN_OVERLAY,		OVERLAYS_PROTO_CASE	},
 -	{"client_QQ_over",			_T("|Miranda*QQ*|MIMQQ*"),					_T("QQ overlay"),						_T("ClientIcons_overlays"),		IDI_QQ_OVERLAY,			OVERLAYS_PROTO_CASE	},
 -	{"client_Tlen_over",		_T("*tlen.pl"),								_T("Tlen.pl overlay"),					_T("ClientIcons_overlays"),		IDI_TLEN_OVERLAY,		OVERLAYS_PROTO_CASE	},
 -	{"client_Yahoo_over",		_T("*yahoo*"),								_T("Yahoo overlay"),					_T("ClientIcons_overlays"),		IDI_YAHOO_OVERLAY,		OVERLAYS_PROTO_CASE	},
 +	{"client_ICQJ_overlay",		_T("|^ICQ*|*ICQ*"),							_T("ICQJ overlay"),						_T("ClientIcons_overlays"),		IDI_ICQJ_OVERLAY,		OVERLAYS_PROTO_CASE	},
 +	{"client_IRC_overlay",		_T("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("|Miranda*Jabber*|*t Jabber*"),			_T("Jabber overlay"),					_T("ClientIcons_overlays"),		IDI_JABBER_OVERLAY,		OVERLAYS_PROTO_CASE	},
 +	{"client_MailRu_overlay",	_T("|*Mail.ru*IM*|*MRA*"),					_T("Mail.Ru Agent overlay"),			_T("ClientIcons_overlays"),		IDI_MAILRU_OVERLAY,		OVERLAYS_PROTO_CASE	},
 +	{"client_MSN_overlay",		_T("Miranda*MSN*"),							_T("MSN overlay"),						_T("ClientIcons_overlays"),		IDI_MSN_OVERLAY,		OVERLAYS_PROTO_CASE	},
 +	{"client_QQ_overlay",		_T("|Miranda*QQ*|MIMQQ*"),					_T("QQ overlay"),						_T("ClientIcons_overlays"),		IDI_QQ_OVERLAY,			OVERLAYS_PROTO_CASE	},
 +	{"client_Tlen_overlay",		_T("*tlen.pl"),								_T("Tlen.pl overlay"),					_T("ClientIcons_overlays"),		IDI_TLEN_OVERLAY,		OVERLAYS_PROTO_CASE	},
 +	{"client_Yahoo_overlay",	_T("*yahoo*"),								_T("Yahoo overlay"),					_T("ClientIcons_overlays"),		IDI_YAHOO_OVERLAY,		OVERLAYS_PROTO_CASE	},
  //###########################################################################################################################################################################################################
  //#################################		CLIENT VERSION OVERLAYS		#########################################################################################################################################
 @@ -716,9 +695,9 @@ KN_FP_MASK def_kn_fp_overlays_mask[] =  	{"client_Mir_05_over",		_T("*Miranda*0.5.*"),						_T("Miranda v0.5 overlay"),				_T("ClientIcons_Miranda"),		IDI_MIRANDA_5,			MIRANDA_VERSION_CASE	},
  	{"client_Mir_04_over",		_T("*Miranda*0.4.*"),						_T("Miranda v0.4 overlay"),				_T("ClientIcons_Miranda"),		IDI_MIRANDA_4,			MIRANDA_VERSION_CASE	},
 -	{"client_ICQ6_over",		_T("ICQ*6*"),								_T("ICQ v6.x overlay"),					_T("ClientIcons_ICQ"),			IDI_ICQ6_OVERLAY,		ICQ_OFFICIAL_CASE	},
 -	{"client_ICQ7_over",		_T("ICQ*7*"),								_T("ICQ v7.x overlay"),					_T("ClientIcons_ICQ"),			IDI_ICQ7_OVERLAY,		ICQ_OFFICIAL_CASE	},
 -	{"client_ICQ8_over",		_T("ICQ*8*"),								_T("ICQ v8.x overlay"),					_T("ClientIcons_ICQ"),			IDI_ICQ8_OVERLAY,		ICQ_OFFICIAL_CASE	},
 +	{"client_ICQ6_over",		_T("ICQ*6*"),								_T("ICQ v6.x overlay"),					_T("ClientIcons_ICQ"),			IDI_ICQ6_OVERLAY,		ICQ_CASE	},
 +	{"client_ICQ7_over",		_T("ICQ*7*"),								_T("ICQ v7.x overlay"),					_T("ClientIcons_ICQ"),			IDI_ICQ7_OVERLAY,		ICQ_CASE	},
 +	{"client_ICQ8_over",		_T("ICQ*8*"),								_T("ICQ v8.x overlay"),					_T("ClientIcons_ICQ"),			IDI_ICQ8_OVERLAY,		ICQ_CASE	},
  	{"client_Yahoo10",			_T("*Yahoo 10*"),							_T("Yahoo v10.x overlay"),				_T("ClientIcons_Yahoo"),		IDI_CLIENT_YAHOO10,		YAHOO_CASE	},
  	{"client_Yahoo9",			_T("*Yahoo 9*"),							_T("Yahoo v9.x overlay"),				_T("ClientIcons_Yahoo"),		IDI_CLIENT_YAHOO9,		YAHOO_CASE	},
 @@ -755,7 +734,7 @@ KN_FP_MASK def_kn_fp_overlays_mask[] =  	{"client_on_iOS",			_T("|*ipad*|*iphone*"),						_T("iOS overlay (iPhone/iPad)"),		_T("ClientIcons_overlays"),		IDI_PLATFORM_IOS,		OVERLAYS_PLATFORM_CASE	},
  	{"client_on_Mac",			_T("|^*smack*|* Mac *|*mac*"),				_T("MacOS overlay"),					_T("ClientIcons_overlays"),		IDI_PLATFORM_MAC,		OVERLAYS_PLATFORM_CASE	},
  	{"client_on_Linux",			_T("*Linux*"),								_T("Linux overlay"),					_T("ClientIcons_overlays"),		IDI_PLATFORM_LINUX,		OVERLAYS_PLATFORM_CASE	},
 -	{"client_on_Flash",			_T("*Flash*"),								_T("Flash overlay"),					_T("ClientIcons_overlays"),		IDI_PLATFORM_FLASH,		OVERLAYS_PLATFORM_CASE	},
 +	{"client_on_Flash",			_T("|*Flash*|*Web*ICQ*|"),					_T("Flash overlay"),					_T("ClientIcons_overlays"),		IDI_PLATFORM_FLASH,		OVERLAYS_PLATFORM_CASE	},
  	{"client_on_Java",			_T("|*Java*|jagent*|ICQ2Go!*"),				_T("Java overlay"),						_T("ClientIcons_overlays"),		IDI_PLATFORM_JAVA,		OVERLAYS_PLATFORM_CASE	},
  	{"client_on_Symbian",		_T("|*Symbian*|sagent*"),					_T("Symbian overlay"),					_T("ClientIcons_overlays"),		IDI_PLATFORM_SYMBIAN,	OVERLAYS_PLATFORM_CASE	},
  	{"client_on_Android",		_T("|*Android*|"),							_T("Android overlay"),					_T("ClientIcons_overlays"),		IDI_PLATFORM_ANDROID,	OVERLAYS_PLATFORM_CASE	},
 diff --git a/plugins/FingerprintNG/src/resource.h b/plugins/FingerprintNG/src/resource.h index 364f3dbcf6..ab311b973a 100644 --- a/plugins/FingerprintNG/src/resource.h +++ b/plugins/FingerprintNG/src/resource.h @@ -146,42 +146,43 @@  //##############################################################################################################
  //Unofficial ICQ clients
 -#define IDI_1UND1				201
 -#define IDI_ALICQ				202
 -#define IDI_ANASTASIA			203
 -#define IDI_ANDRQ				204
 -#define IDI_ASIA				205
 -#define IDI_COREPAGER			206
 -#define IDI_DELPHI				207
 -#define IDI_DICHAT				208
 -#define IDI_GLICQ				209
 -#define IDI_GNOMEICU			210
 -#define IDI_ICAT				211
 -#define IDI_ICQ2X				212
 -#define IDI_ICY_JUICE			213
 -#define IDI_JICQ				214
 -#define IDI_KXICQ				215
 +
 +#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_MICQ				219
 -#define IDI_MIP					220
 -#define IDI_NANOICQ				221
 -#define IDI_NICQ				222
 -#define IDI_QIP					223
 -#define IDI_RANDQ_NEW			224
 -#define IDI_SMAPER				225
 -#define IDI_SMARTICQ			226
 -#define IDI_SPAMBOT				227
 -#define IDI_STICQ				228
 -#define IDI_STRICQ				229
 -#define IDI_TICQ				230
 -#define IDI_VICQ				231
 -#define IDI_VIRUS				232
 -#define IDI_VMICQ				233
 -#define IDI_WEBICQ				234
 -#define IDI_YEEMP				235
 -#define IDI_YSM					236
 +#define IDI_QIP_2005			219
 +#define IDI_RANDQ				220
 +#define IDI_SMARTICQ			221
 +#define IDI_SPAM				222
 +#define IDI_STRICQ				223
 +#define IDI_TICQ				234
 +
 +//#define IDI_ALICQ				251
 +//#define IDI_ANASTASIA			252
 +//#define IDI_ANDRQ				253
 +//#define IDI_COREPAGER			254
 +//#define IDI_DELPHI			255
 +//#define IDI_GLICQ				256
 +//#define IDI_ICAT				257
 +//#define IDI_ICQ2X				258
 +//#define IDI_JICQ				259
 +//#define IDI_KXICQ				260
 +//#define IDI_MICQ				261
 +//#define IDI_MIP				262
 +//#define IDI_NANOICQ			263
 +//#define IDI_NICQ				264
 +//#define IDI_SMAPER			265
 +//#define IDI_STICQ				266
 +//#define IDI_VICQ				267
 +//#define IDI_VIRUS				268
 +//#define IDI_VMICQ				269
 +//#define IDI_WEBICQ			270
 +//#define IDI_YEEMP				271
 +//#define IDI_YSM				272
  //##############################################################################################################
  //IRC
 @@ -466,7 +467,6 @@  //##############################################################################################################
  //AIM
 -#define IDI_AIM					711
  #define IDI_AIM_4				712
  #define IDI_AIM_5				713
  #define IDI_AIM_6  				714
 @@ -595,7 +595,7 @@  #define IDI_BLACKBERRY      	1007
  #define IDI_BUDDYCLOUD      	1008
  #define IDI_CAUSERIE        	1009
 -#define IDI_CENTERICQ			1010
 +#define IDI_1UND1				1010
  #define IDI_CENTERIM        	1011
  #define IDI_CHATSECURE      	1012
  #define IDI_CITRON				1013
 @@ -675,6 +675,7 @@  #define IDI_YAMIGO				1087
  #define IDI_YEIGO           	1088
  #define IDI_YOONO           	1089
 +#define IDI_XFIRE				1090
  //##############################################################################################################
  //resources
 diff --git a/plugins/FingerprintNG/src/version.h b/plugins/FingerprintNG/src/version.h index b353195c3e..a2fb55ce70 100644 --- a/plugins/FingerprintNG/src/version.h +++ b/plugins/FingerprintNG/src/version.h @@ -37,7 +37,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.  #define __BETA_FILE_TITLE "fingerprint"
 -#define __LEGAL_COPYRIGHT_STRING "© 2006-12 ghazan, mataes, HierOS, FYR, Bio, nullbie, faith_healer and all respective contributors."
 +#define __LEGAL_COPYRIGHT_STRING "©2006-12 ghazan, mataes, HierOS, FYR, Bio, nullbie, faith_healer and all respective contributors."
  // Fingerprint interface ID. Should be the same for ALL fingerprint plugins.
  // {FFF4B77A-CE40-11DB-A5CD-06A755D89593}
  | 
