Fingerprint: delete all Yahoo-related content

5 files changed, 0 insertions, 35 deletions

diff --git a/plugins/FingerprintNG/src/finger_groups.h b/plugins/FingerprintNG/src/finger_groups.h
index 10e6bff723..c0ef7d0c1b 100644
--- a/plugins/FingerprintNG/src/finger_groups.h
+++ b/plugins/FingerprintNG/src/finger_groups.h
@@ -63,11 +63,6 @@ case WEATHER_CASE:
 		return LPGENW("Client icons") L"/" LPGENW("Weather clients");

 	break;

 

-case YAHOO_CASE:

-	if (db_get_b(NULL, MODULENAME, "GroupYahoo", 1))

-		return LPGENW("Client icons") L"/" LPGENW("Yahoo clients");

-	break;

-

 case FACEBOOK_CASE:

 	if (db_get_b(NULL, MODULENAME, "GroupFacebook", 1))

 		return LPGENW("Client icons") L"/" LPGENW("Facebook clients");

diff --git a/plugins/FingerprintNG/src/masks.cpp b/plugins/FingerprintNG/src/masks.cpp
index 24c37bb236..f97b0e77f3 100644
--- a/plugins/FingerprintNG/src/masks.cpp
+++ b/plugins/FingerprintNG/src/masks.cpp
@@ -512,15 +512,6 @@ KN_FP_MASK def_kn_fp_mask[] =
 	{ "client_MRA_unknown", L"|Mail.ru Agent*|MRA client", LPGENW("Mail.Ru (unknown client)"), IDI_MAIL_RU_UNKNOWN, MRA_CASE },

 

 	//#########################################################################################################################################################################

-	//#################################   YAHOO   #############################################################################################################################

-	//#########################################################################################################################################################################

-	{ "client_YahGoMobile", L"|Yahoo*Go*|Yahoo*Mobile*", L"Yahoo! Go Mobile", IDI_YAHOO_GO_MOBILE, YAHOO_CASE, TRUE },

-	{ "client_PingBox", L"*Yahoo*PingBox*", L"Yahoo PingBox", IDI_YAHOO_PINGBOX, YAHOO_CASE, TRUE },

-	{ "client_YahooWeb", L"*Yahoo*Web*Messenger", L"Yahoo Web Messenger", IDI_YAHOO_WEB, YAHOO_CASE, TRUE },

-	{ "client_libyahoo2", L"*libyahoo*", L"libyahoo2", IDI_LIBYAHOO2, YAHOO_CASE, TRUE },

-	{ "client_Yahoo", L"*Yahoo*", L"Yahoo Messenger", IDI_YAHOO, YAHOO_CASE },

-

-	//#########################################################################################################################################################################

 	//#################################   WEATHER   ###########################################################################################################################

 	//#########################################################################################################################################################################

 	{ "client_accu", L"*accuweather*", L"AccuWeather", IDI_ACCU, WEATHER_CASE, TRUE },

@@ -676,7 +667,6 @@ KN_FP_MASK def_kn_fp_overlays_mask[] =
 	{ "client_Jabber_overlay", L"|^jabber*|Miranda*Jabber*|py*jabb*", LPGENW("Jabber overlay"), IDI_JABBER_OVERLAY, OVERLAYS_PROTO_CASE },

 	{ "client_MSN_overlay", L"|^MSN*|*Miranda*MSN*", LPGENW("MSN overlay"), IDI_MSN_OVERLAY, OVERLAYS_PROTO_CASE },

 	{ "client_QQ_overlay", L"|Miranda*QQ*|MIM*QQ*", LPGENW("QQ overlay"), IDI_QQ_OVERLAY, OVERLAYS_PROTO_CASE },

-	{ "client_Yahoo_overlay", L"|^Yahoo*|*yahoo*", LPGENW("Yahoo overlay"), IDI_YAHOO_OVERLAY, OVERLAYS_PROTO_CASE },

 	{ "client_MRA_overlay", L"|^MRA*|^Mail.ru*"

 							L"|*MRA*|*Mail.ru*IM*|Mrim*"

 							L"|*DRQZ00fz5WPn1gH+*|*nxthUwJANorB6+*|ICQ client", LPGENW("Mail.Ru Agent overlay"), IDI_MAILRU_OVERLAY, OVERLAYS_PROTO_CASE },

@@ -693,10 +683,6 @@ KN_FP_MASK def_kn_fp_overlays_mask[] =
 	{ "client_ICQ7_over", L"ICQ*7*", LPGENW("ICQ v7.x overlay"), IDI_ICQ7_OVERLAY, ICQ_CASE },

 	{ "client_ICQ8_over", L"ICQ*8*", LPGENW("ICQ v8.x overlay"), IDI_ICQ8_OVERLAY, ICQ_CASE },

 

-	{ "client_Yahoo_11", L"*Yahoo 11*", LPGENW("Yahoo v11.x overlay"), IDI_YAHOO11_OVERLAY, YAHOO_CASE },

-	{ "client_Yahoo_10", L"*Yahoo 10*", LPGENW("Yahoo v10.x overlay"), IDI_YAHOO10_OVERLAY, YAHOO_CASE },

-	{ "client_Yahoo_9", L"*Yahoo 9*", LPGENW("Yahoo v9.x overlay"), IDI_YAHOO9_OVERLAY, YAHOO_CASE },

-

 	{ "client_GG_11", L"|Gadu-Gadu*11*|GG*11*", LPGENW("Gadu-Gadu v11 client"), IDI_GG11_OVERLAY, GG_CASE },

 	{ "client_GG_10", L"|Gadu-Gadu*10*|GG*10", LPGENW("Gadu-Gadu v10 client"), IDI_GG10_OVERLAY, GG_CASE },

 	{ "client_GG_9", L"|Gadu-Gadu*9*|GG*9*", LPGENW("Gadu-Gadu v9 client"), IDI_GG9_OVERLAY, GG_CASE },

diff --git a/plugins/FingerprintNG/src/options.cpp b/plugins/FingerprintNG/src/options.cpp
index b8dc5dc728..1e14f09a36 100644
--- a/plugins/FingerprintNG/src/options.cpp
+++ b/plugins/FingerprintNG/src/options.cpp
@@ -42,7 +42,6 @@ static settings[] =
 	{ IDC_GROUP_QQ, TRUE, "GroupQQ" },

 	{ IDC_GROUP_RSS, TRUE, "GroupRSS" },

 	{ IDC_GROUP_WEATHER, TRUE, "GroupWeather" },

-	{ IDC_GROUP_YAHOO, TRUE, "GroupYahoo" },

 	{ IDC_GROUP_FACEBOOK, TRUE, "GroupFacebook" },

 	{ IDC_GROUP_VK, TRUE, "GroupVK" },

 

diff --git a/plugins/FingerprintNG/src/resource.h b/plugins/FingerprintNG/src/resource.h
index dd4663cbe7..e54b1ac4db 100644
--- a/plugins/FingerprintNG/src/resource.h
+++ b/plugins/FingerprintNG/src/resource.h
@@ -63,7 +63,6 @@
 #define IDI_MAILRU_OVERLAY              85

 #define IDI_MSN_OVERLAY                 86

 #define IDI_QQ_OVERLAY                  87

-#define IDI_YAHOO_OVERLAY               89

 #define IDI_VK_OVERLAY                  90

 #define IDI_SKYPE_OVERLAY               91

 #define IDI_SECUREIM_OVERLAY            95

@@ -454,18 +453,6 @@
 #define IDI_YWEATHER                    811

 #define IDI_METEONOVOSTI                812

 #define IDI_NOAA                        813

-#define IDI_LIBYAHOO2                   821

-#define IDI_YAHOO_PINGBOX               822

-#define IDI_YAHOO                       823

-#define IDI_YAHOO_WEB                   828

-#define IDI_YAHOO_GO_MOBILE             829

-#define IDI_YAHOO5_OVERLAY              831

-#define IDI_YAHOO6_OVERLAY              832

-#define IDI_YAHOO7_OVERLAY              833

-#define IDI_YAHOO8_OVERLAY              834

-#define IDI_YAHOO9_OVERLAY              835

-#define IDI_YAHOO10_OVERLAY             836

-#define IDI_YAHOO11_OVERLAY             837

 #define IDI_ADIUM                       1000

 #define IDI_AGILE                       1001

 #define IDI_APPOLO                      1002

@@ -588,7 +575,6 @@
 #define IDC_GROUP_QQ                    10037

 #define IDC_GROUP_RSS                   10038

 #define IDC_GROUP_WEATHER               10040

-#define IDC_GROUP_YAHOO                 10041

 #define IDC_GROUP_FACEBOOK              10042

 #define IDC_GROUP_VK                    10043

 #define IDC_GROUP_OTHER_PROTOS          10044

diff --git a/plugins/FingerprintNG/src/stdafx.h b/plugins/FingerprintNG/src/stdafx.h
index 2a7d2521bb..ff214e3e64 100644
--- a/plugins/FingerprintNG/src/stdafx.h
+++ b/plugins/FingerprintNG/src/stdafx.h
@@ -85,7 +85,6 @@ typedef struct _foundInfo
 #define QQ_CASE						3013	//	QQ clients (+ versions)

 #define RSS_CASE					3014	//	RSS clients

 #define WEATHER_CASE				3016	//	Weather clients

-#define YAHOO_CASE					3017	//	Yahoo clients (+ versions)

 #define FACEBOOK_CASE               3018    //  Facebook clients

 #define VK_CASE                     3019    //  VK clients