- FingerprintNG: uKeeper jabber bot detection added, pyICQ detect fixed

git-svn-id: http://svn.miranda-ng.org/main/trunk@2622 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

4 files changed, 19 insertions, 16 deletions

diff --git a/plugins/FingerprintNG/res/icons/Jabber/uKeeper.ico b/plugins/FingerprintNG/res/icons/Jabber/uKeeper.ico
new file mode 100644
index 0000000000..a2963a831d
--- /dev/null
+++ b/plugins/FingerprintNG/res/icons/Jabber/uKeeper.ico
diff --git a/plugins/FingerprintNG/res/icons_Jabber.rc b/plugins/FingerprintNG/res/icons_Jabber.rc
index 6349294eb1..e399d4e447 100644
--- a/plugins/FingerprintNG/res/icons_Jabber.rc
+++ b/plugins/FingerprintNG/res/icons_Jabber.rc
@@ -214,6 +214,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 	IDI_TRIPLE_SOFTWARE		ICON	"icons\\Jabber\\TripleSoftwareIM.ico"

 	IDI_TWITTER				ICON	"icons\\Jabber\\Twitter.ico"

 //	IDI_UJABBER				ICON	"icons\\Jabber\\uJabber.ico"

+	IDI_UKEEPER				ICON	"icons\\Jabber\\uKeeper.ico"

 	IDI_VACUUM				ICON	"icons\\Jabber\\Vacuum.ico"

 	IDI_VANDV				ICON	"icons\\Jabber\\V&V Messenger.ico"

 	IDI_VAYUSPHERE			ICON	"icons\\Jabber\\Vayusphere.ico"

diff --git a/plugins/FingerprintNG/src/masks.cpp b/plugins/FingerprintNG/src/masks.cpp
index 0ebac54086..5dcfb1620a 100644
--- a/plugins/FingerprintNG/src/masks.cpp
+++ b/plugins/FingerprintNG/src/masks.cpp
@@ -152,7 +152,7 @@ KN_FP_MASK def_kn_fp_mask[] =
 	{"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("|*Python*|Py*|Py*-t*|*ταλιςμαη*"),	_T("Python-based clients"),				_T("ClientIcons_multiproto"),	IDI_PYTHON,				MULTI_CASE	},

+	{"client_Python",			_T("|^*Pygeon*|*Python*|Py*|*ταλιςμαη*"),	_T("Python-based 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	},

 	{"client_QIP_iOS",			_T("|QIP*iOS*|QIP*iphone*|QIP*apple*"),		_T("QIP Mobile iOS"),					_T("ClientIcons_multiproto"),	IDI_QIP_IOS,			MULTI_CASE,		TRUE	},

@@ -415,6 +415,7 @@ KN_FP_MASK def_kn_fp_mask[] =
 	{"client_studivz",			_T("*studivz*"),							_T("StudiVZ"),							_T("ClientIcons_Jabber"),		IDI_STUDIVZ,			JABBER_CASE,	TRUE	},

 	{"client_tkchat",			_T("*tkchat*"),								_T("tkchat"),							_T("ClientIcons_Jabber"),		IDI_TKCHAT,				JABBER_CASE,	TRUE	},

 //	{"client_uJabber",			_T("*uJabber*"),							_T("uJabber"),							_T("ClientIcons_Jabber"),		IDI_UJABBER,			JABBER_CASE,	TRUE	},

+	{"client_uKeeper",			_T("*uKeeper*"),							_T("uKeeper"),							_T("ClientIcons_Jabber"),		IDI_UKEEPER,			JABBER_CASE,	TRUE	},

 	{"client_whoisbot",			_T("whoisbot"),								_T("Swissjabber Whois Bot"),			_T("ClientIcons_Jabber"),		IDI_WHOISBOT,			JABBER_CASE,	TRUE	},

 	{"client_xeus2",			_T("*xeus 2*"),								_T("xeus 2"),							_T("ClientIcons_Jabber"),		IDI_XEUS2,				JABBER_CASE,	TRUE	},

 	{"client_xeus",				_T("*xeus*"),								_T("xeus"),								_T("ClientIcons_Jabber"),		IDI_XEUS,				JABBER_CASE,	TRUE	},

diff --git a/plugins/FingerprintNG/src/resource.h b/plugins/FingerprintNG/src/resource.h
index 362b10e01a..9f74850e42 100644
--- a/plugins/FingerprintNG/src/resource.h
+++ b/plugins/FingerprintNG/src/resource.h
@@ -407,21 +407,22 @@
 #define IDI_TRIPLE_SOFTWARE			582

 #define IDI_TWITTER					583

 //#define IDI_UJABBER				584

-#define IDI_VACUUM					585

-#define IDI_VANDV					586

-#define IDI_VAYUSPHERE				587

-#define IDI_VBUZZER					588

-#define IDI_VIRTUS					589

-#define IDI_VK						590

-#define IDI_VYSPER					591

-#define IDI_WANNACHAT				592

-#define IDI_WEBEX					593

-#define IDI_WHISPERIM				594

-#define IDI_WHOISBOT				595

-#define IDI_WIJA					596

-#define IDI_WILDFIRE				597

-#define IDI_WINJAB					598

-#define IDI_WTW						599

+#define IDI_UKEEPER					585

+#define IDI_VACUUM					586

+#define IDI_VANDV					587

+#define IDI_VAYUSPHERE				588

+#define IDI_VBUZZER					589

+#define IDI_VIRTUS					590

+#define IDI_VK						591

+#define IDI_VYSPER					592

+#define IDI_WANNACHAT				593

+#define IDI_WEBEX					594

+#define IDI_WHISPERIM				595

+#define IDI_WHOISBOT				596

+#define IDI_WIJA					597

+#define IDI_WILDFIRE				598

+#define IDI_WINJAB					599

+#define IDI_WTW						600

 #define IDI_XABBER					601

 #define IDI_GABBLE					602

 #define IDI_XEUS					603