From 9d39b63af2a386e7d7528586a6deda509018f249 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Fri, 14 Jun 2013 17:45:43 +0000 Subject: - FingerprintNG: added WhatsApp and Google+ Hangouts detection - langpacks/english: updated git-svn-id: http://svn.miranda-ng.org/main/trunk@4942 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- .../iconpacks/res/Others/Google+ Hangouts.ico | Bin 0 -> 1150 bytes plugins/FingerprintNG/iconpacks/res/Others/WhatsApp.ico | Bin 0 -> 1150 bytes plugins/FingerprintNG/iconpacks/res/fp_icons.rc | 4 +++- plugins/FingerprintNG/src/masks.cpp | 10 +++++++--- plugins/FingerprintNG/src/resource.h | 3 +++ 5 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 plugins/FingerprintNG/iconpacks/res/Others/Google+ Hangouts.ico create mode 100644 plugins/FingerprintNG/iconpacks/res/Others/WhatsApp.ico (limited to 'plugins/FingerprintNG') diff --git a/plugins/FingerprintNG/iconpacks/res/Others/Google+ Hangouts.ico b/plugins/FingerprintNG/iconpacks/res/Others/Google+ Hangouts.ico new file mode 100644 index 0000000000..328ded0e6e Binary files /dev/null and b/plugins/FingerprintNG/iconpacks/res/Others/Google+ Hangouts.ico differ diff --git a/plugins/FingerprintNG/iconpacks/res/Others/WhatsApp.ico b/plugins/FingerprintNG/iconpacks/res/Others/WhatsApp.ico new file mode 100644 index 0000000000..3388be0b11 Binary files /dev/null and b/plugins/FingerprintNG/iconpacks/res/Others/WhatsApp.ico differ diff --git a/plugins/FingerprintNG/iconpacks/res/fp_icons.rc b/plugins/FingerprintNG/iconpacks/res/fp_icons.rc index 31ad67bc83..1da5d855aa 100644 --- a/plugins/FingerprintNG/iconpacks/res/fp_icons.rc +++ b/plugins/FingerprintNG/iconpacks/res/fp_icons.rc @@ -619,7 +619,9 @@ IDI_FACEBOOK ICON "others\\Facebook.ico" IDI_SKYPE ICON "others\\Skype.ico" IDI_TWITTER ICON "others\\Twitter.ico" - IDI_XFIRE ICON "others\\xfire.ico" + IDI_XFIRE ICON "others\\xFire.ico" + IDI_HANGOUTS ICON "others\\Google+ Hangouts.ico" + IDI_WHATSAPP ICON "others\\WhatsApp.ico" //############################################################################################################## //##################################### Miranda client overlays ################################################ diff --git a/plugins/FingerprintNG/src/masks.cpp b/plugins/FingerprintNG/src/masks.cpp index e97c3ed6a1..ff0fdbd9cd 100644 --- a/plugins/FingerprintNG/src/masks.cpp +++ b/plugins/FingerprintNG/src/masks.cpp @@ -600,12 +600,16 @@ KN_FP_MASK def_kn_fp_mask[] = {"client_Pidgin", _T("|*Pidgin*|*libpurple*|Purple*"), _T("Pidgin (libpurple)"), IDI_PIDGIN, MULTI_CASE }, - {"client_Python", _T("|*Python*|Py*|*ταλιςμαη*"), LPGENT("Python-based clients"), IDI_PYTHON, MULTI_CASE }, + {"client_Python", _T("|*Python*|Py*|*ταλιςμαη*"), LPGENT("Python-based clients"), IDI_PYTHON, MULTI_CASE }, - {"client_Jabber", _T("*Jabber*client*"), LPGENT("Jabber client"), IDI_JABBER, JABBER_CASE, TRUE }, + {"client_Jabber", _T("*Jabber*client*"), LPGENT("Jabber client"), IDI_JABBER, JABBER_CASE, TRUE }, - {"client_XMPP", _T("|*XMPP*|Mrim*|*DRQZ00fz5WPn1gH+*"), LPGENT("XMPP client"), IDI_XMPP, JABBER_CASE }, + {"client_XMPP", _T("|*XMPP*|Mrim*|*DRQZ00fz5WPn1gH+*"), LPGENT("XMPP client"), IDI_XMPP, JABBER_CASE }, + {"client_Hangouts", _T("*messaging-AChromeExtension*"), _T("Google+ Hangouts"), IDI_HANGOUTS, OTHER_PROTOS_CASE, TRUE }, + + {"client_WhatsApp", _T("*WhatsApp*"), _T("WhatsApp"), IDI_WHATSAPP, OTHER_PROTOS_CASE, TRUE }, + {"client_Twitter", _T("*Twitter*"), _T("Twitter"), IDI_TWITTER, OTHER_PROTOS_CASE, TRUE }, {"client_Skype", _T("*Skype**"), _T("Skype"), IDI_SKYPE, OTHER_PROTOS_CASE, TRUE }, diff --git a/plugins/FingerprintNG/src/resource.h b/plugins/FingerprintNG/src/resource.h index 203b76f31e..d219bdaf3b 100644 --- a/plugins/FingerprintNG/src/resource.h +++ b/plugins/FingerprintNG/src/resource.h @@ -577,6 +577,9 @@ #define IDI_SKYPE 9002 #define IDI_TWITTER 9003 #define IDI_XFIRE 9004 +#define IDI_HANGOUTS 9005 +#define IDI_WHATSAPP 9006 + #define IDD_DIALOG 10000 #define IDC_GROUP_MIRANDA 10025 #define IDC_GROUP_MIRANDA_VERSION 10026 -- cgit v1.2.3