FingerPrint: we don't need icons for Weather anymore

16 files changed, 1 insertions, 39 deletions

diff --git a/plugins/FingerprintNG/iconpacks/res/Weather/AccuWeather.ico b/plugins/FingerprintNG/iconpacks/res/Weather/AccuWeather.ico
deleted file mode 100644
index 91e92daf27..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/Weather/AccuWeather.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/iconpacks/res/Weather/gismeteo.ico b/plugins/FingerprintNG/iconpacks/res/Weather/gismeteo.ico
deleted file mode 100644
index 67fdc78d1a..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/Weather/gismeteo.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/iconpacks/res/Weather/intelli.ico b/plugins/FingerprintNG/iconpacks/res/Weather/intelli.ico
deleted file mode 100644
index e6370e0538..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/Weather/intelli.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/iconpacks/res/Weather/meteogid.ico b/plugins/FingerprintNG/iconpacks/res/Weather/meteogid.ico
deleted file mode 100644
index 3df898e1ca..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/Weather/meteogid.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/iconpacks/res/Weather/meteonovosti.ico b/plugins/FingerprintNG/iconpacks/res/Weather/meteonovosti.ico
deleted file mode 100644
index a76db3d69d..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/Weather/meteonovosti.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/iconpacks/res/Weather/noaa.ico b/plugins/FingerprintNG/iconpacks/res/Weather/noaa.ico
deleted file mode 100644
index ab9a9e2f93..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/Weather/noaa.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/iconpacks/res/Weather/realmeteo.ico b/plugins/FingerprintNG/iconpacks/res/Weather/realmeteo.ico
deleted file mode 100644
index 55dd25d89e..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/Weather/realmeteo.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/iconpacks/res/Weather/underground.ico b/plugins/FingerprintNG/iconpacks/res/Weather/underground.ico
deleted file mode 100644
index 1b3df3d9b7..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/Weather/underground.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/iconpacks/res/Weather/weather.ico b/plugins/FingerprintNG/iconpacks/res/Weather/weather.ico
deleted file mode 100644
index 74045b66b3..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/Weather/weather.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/iconpacks/res/Weather/weather_cn.ico b/plugins/FingerprintNG/iconpacks/res/Weather/weather_cn.ico
deleted file mode 100644
index 94f6a415b8..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/Weather/weather_cn.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/iconpacks/res/Weather/weatherxml.ico b/plugins/FingerprintNG/iconpacks/res/Weather/weatherxml.ico
deleted file mode 100644
index a43f6daa0a..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/Weather/weatherxml.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/iconpacks/res/Weather/wetter.ico b/plugins/FingerprintNG/iconpacks/res/Weather/wetter.ico
deleted file mode 100644
index 7faf7da728..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/Weather/wetter.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/iconpacks/res/Weather/yweather.ico b/plugins/FingerprintNG/iconpacks/res/Weather/yweather.ico
deleted file mode 100644
index 08a05f0c2b..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/Weather/yweather.ico
+++ /dev/null
diff --git a/plugins/FingerprintNG/iconpacks/res/fp_icons.rc b/plugins/FingerprintNG/iconpacks/res/fp_icons.rc
index f9925a8e84..c89db42afd 100644
--- a/plugins/FingerprintNG/iconpacks/res/fp_icons.rc
+++ b/plugins/FingerprintNG/iconpacks/res/fp_icons.rc
@@ -447,19 +447,6 @@ IDI_GG8_OVERLAY         ICON                    "GG\\overlay_GG_v8.ico"
 IDI_GG9_OVERLAY         ICON                    "GG\\overlay_GG_v9.ico"

 IDI_GG10_OVERLAY        ICON                    "GG\\overlay_GG_v10.ico"

 IDI_GG11_OVERLAY        ICON                    "GG\\overlay_GG_v11.ico"

-IDI_ACCU                ICON                    "Weather\\AccuWeather.ico"

-IDI_GISMETEO            ICON                    "Weather\\gismeteo.ico"

-IDI_INTELLI             ICON                    "Weather\\intelli.ico"

-IDI_METEOGID            ICON                    "Weather\\meteogid.ico"

-IDI_METEONOVOSTI        ICON                    "Weather\\meteonovosti.ico"

-IDI_NOAA                ICON                    "Weather\\noaa.ico"

-IDI_REALMETEO           ICON                    "Weather\\realmeteo.ico"

-IDI_UNDERGROUND         ICON                    "Weather\\underground.ico"

-IDI_WEATHER             ICON                    "Weather\\weather.ico"

-IDI_WEATHER_CN          ICON                    "Weather\\weather_cn.ico"

-IDI_WEATHERXML          ICON                    "Weather\\weatherxml.ico"

-IDI_WETTER              ICON                    "Weather\\wetter.ico"

-IDI_YWEATHER            ICON                    "Weather\\yweather.ico"

 IDI_FACEBOOK            ICON                    "Facebook\\Facebook.ico"

 IDI_FACEBOOK_APP        ICON                    "Facebook\\facebook_app.ico"

 IDI_FACEBOOK_MESSENGER  ICON                    "Facebook\\facebook_messenger.ico"

diff --git a/plugins/FingerprintNG/src/masks.cpp b/plugins/FingerprintNG/src/masks.cpp
index d3be3b2233..c475613992 100644
--- a/plugins/FingerprintNG/src/masks.cpp
+++ b/plugins/FingerprintNG/src/masks.cpp
@@ -468,19 +468,7 @@ static KN_FP_MASK def_kn_fp_mask[] =
 	/////////////////////////////////////////////////////////////////////////////////////////

 	// WEATHER

 

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

-	{ "client_gismeteo", L"*gismeteo*", L"GisMeteo", IDI_GISMETEO, WEATHER_CASE, TRUE },

-	{ "client_intelli", L"*intellicast*", L"Intellicast", IDI_INTELLI, WEATHER_CASE, TRUE },

-	{ "client_meteogid", L"|*meteo-gid*|*meteogid*", L"Meteo-Gid", IDI_METEOGID, WEATHER_CASE, TRUE },

-	{ "client_meteonovosti", L"*meteonovosti*", L"Meteonovosti", IDI_METEONOVOSTI, WEATHER_CASE, TRUE },

-	{ "client_noaa", L"*noaa*", L"NOAA Weather", IDI_NOAA, WEATHER_CASE, TRUE },

-	{ "client_real", L"*realmeteo*", L"RealMeteo", IDI_REALMETEO, WEATHER_CASE, TRUE },

-	{ "client_under", L"Weather Underground*", L"Weather Underground", IDI_UNDERGROUND, WEATHER_CASE, TRUE },

-	{ "client_weatherxml", L"*WeatherXML*", L"WeatherXML", IDI_WEATHERXML, WEATHER_CASE, TRUE },

-	{ "client_wetter", L"*wetter*", L"Wetter", IDI_WETTER, WEATHER_CASE, TRUE },

-	{ "client_yweather", L"*Yahoo Weather*", L"Yahoo Weather", IDI_YWEATHER, WEATHER_CASE, TRUE },

-	{ "client_weather_cn", L"*weather.com.cn*", L"Weather CN", IDI_WEATHER_CN, WEATHER_CASE, TRUE },

-	{ "client_weather", L"*weather*", L"Weather", IDI_WEATHER, WEATHER_CASE, TRUE },

+	// { "client_gismeteo", L"*gismeteo*", L"GisMeteo", IDI_GISMETEO, WEATHER_CASE, TRUE },

 

 	/////////////////////////////////////////////////////////////////////////////////////////

 	// RSS

diff --git a/plugins/FingerprintNG/src/resource.h b/plugins/FingerprintNG/src/resource.h
index 109a505d73..36b563af03 100644
--- a/plugins/FingerprintNG/src/resource.h
+++ b/plugins/FingerprintNG/src/resource.h
@@ -380,19 +380,6 @@
 #define IDI_RSS09                       763

 #define IDI_RSS1                        764

 #define IDI_RSS2                        765

-#define IDI_ACCU                        801

-#define IDI_GISMETEO                    802

-#define IDI_INTELLI                     803

-#define IDI_REALMETEO                   804

-#define IDI_WETTER                      805

-#define IDI_UNDERGROUND                 806

-#define IDI_WEATHER                     807

-#define IDI_WEATHER_CN                  808

-#define IDI_WEATHERXML                  809

-#define IDI_METEOGID                    810

-#define IDI_YWEATHER                    811

-#define IDI_METEONOVOSTI                812

-#define IDI_NOAA                        813

 #define IDI_ADIUM                       1000

 #define IDI_AGILE                       1001

 #define IDI_APPOLO                      1002