Merge pull request #530 from cptspiff/weather

changed: always fetch weather using an add-on

2 files changed, 1 insertions, 41 deletions

diff --git a/addons/skin.confluence/720p/Home.xml b/addons/skin.confluence/720p/Home.xml
index 8e8fec820d..8d4c9cca2d 100644
--- a/addons/skin.confluence/720p/Home.xml
+++ b/addons/skin.confluence/720p/Home.xml
@@ -589,7 +589,7 @@
 						<onclick>ActivateWindow(Weather)</onclick>
 						<icon>special://skin/backgrounds/weather.jpg</icon>
 						<thumb>$INFO[Skin.String(Home_Custom_Back_Weather_Folder)]</thumb>
-						<visible>!Skin.HasSetting(HomeMenuNoWeatherButton)</visible>
+						<visible>!Skin.HasSetting(HomeMenuNoWeatherButton)+!IsEmpty(Weather.Plugin)</visible>
 					</item>
 					<item id="4">
 						<label>1</label>
diff --git a/addons/weather.xbmc.builtin/addon.xml b/addons/weather.xbmc.builtin/addon.xml
deleted file mode 100644
index 595436d1da..0000000000
--- a/addons/weather.xbmc.builtin/addon.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="weather.xbmc.builtin"
-       name="Weather.com (standard)"
-       version="1.0.0"
-       provider-name="Team XBMC">
-  <extension point="xbmc.python.weather" library=""/>
-  <extension point="xbmc.addon.metadata">
-    <summary lang="br">Condições meteorológicas atuais.</summary>
-    <summary lang="ca">Condicions meteorològiques actuals.</summary>
-    <summary lang="en">Current weather conditions.</summary>
-    <summary lang="es">Condiciones meteorológicas actuales.</summary>
-    <summary lang="de">Aktuelle Wetterbedingungen</summary>
-    <summary lang="fr">Conditions météorologiques en cours.</summary>
-    <summary lang="hu">A jelenlegi időjárás.</summary>
-    <summary lang="ko">현재 날씨</summary>
-    <summary lang="nl">Huidige weersomstandigheden.</summary>
-    <summary lang="pl">Aktualne warunki pogodowe.</summary>
-    <summary lang="pt">Condições meteorológicas actuais.</summary>
-    <summary lang="ro">Condiții meteo curente.</summary>
-    <summary lang="ru">Текущие погодные условия.</summary>
-    <summary lang="se">Aktuella väderförhållanden.</summary>
-    <summary lang="zh">当前天气状况</summary>
-    <description lang="br">Esta é a origem padrão de informação meteorológicas.[CR][CR]Ela provê as condições atuais e previsão para quatro dias.</description>
-    <description lang="ca">Aquesta és la font per defecte de la informació meteorològica.[CR][CR]Proporciona les condicions meteorològiques actuals i una predicció a 4 dies.</description>
-    <description lang="en">This is the default weather source.[CR][CR]It provides current weather conditions and a four day outlook.</description>
-    <description lang="es">Fuente para las condiciones meteorológicas.[CR][CR]Proporciona las condiciones meteorológicas actuales y una previsión para 4 días.</description>
-    <description lang="de">Standardquelle für Wetterinformationen[CR][CR]Das aktuelle Wetter sowie eine 4 tägige Vorausschau werden angezeigt</description>
-    <description lang="fr">C'est la source météo par défaut.[CR][CR]Fournit les conditions climatiques en cours et les prévisions sur 4 jours.</description>
-    <description lang="hu">Ez az alapértelmezett időjárás információforrás.[CR][CR]Tájékoztat a jelenlegi időjárásról, valamint négynapos előrejelzést ad.</description>
-    <description lang="ko">기본 날씨 정보입니다.[CR][CR] 현재날씨와 4일치 예보를 제공합니다.</description>
-    <description lang="nl">Dit is de standaardbron voor weersinformatie.[CR][CR]Het toont de huidige weersomstandigheden en de voorspellingen voor de vier volgende dagen.</description>
-    <description lang="pl">Jest to domyślne źródło pogody.[CR][CR]Dostarcza aktualną pogodę oraz prognozę na cztery dni.</description>
-    <description lang="pt">Fonte padrão das condições meteorológicas.[CR][CR]Providencia as condições meteorológicas actuais e previsão para quatro dias.</description>
-    <description lang="ro">Sursă implicită pentru informații meteorologice.[CR][CR]Furnizează condiții meteo curente plus prognoza pe 4 zile.</description>
-    <description lang="ru">Это источник информации о погоде.[CR][CR]Он предоставляет текущие погодные условия и прогноза на четыре дня.</description>
-    <description lang="se">Detta är standardkällan för väder.[CR][CR]Det tillhandahåller nuvarande väderförhållanden och en fyra dagars prognos.</description>
-    <description lang="zh">这是默认的天气预报信息来源。[CR][CR]它提供了当前的天气状况和未来4天的天气预报。</description>
-    <platform>all</platform>
-  </extension>
-</addon>