Merge lp:~martin-borho/ubuntu-weather-app/iconfix into lp:ubuntu-weather-app/obsolete.trunk

[Martin Borho]

hotfix for inaccurate api data (icon code incorrect)

Fix for broken value in OWM api response for condition icon. See http://bugs.openweathermap.org/issues/72

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:21
http://91.189.93.125:8080/job/ubuntu-weather-app-ci/14/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-weather-app-raring-amd64-ci/14

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/ubuntu-weather-app-ci/14/rebuild

review: Approve (continuous-integration)

[Raúl Yeguas (neokore)]

Thank you for being noticing these kind of details. Great work!

review: Approve

=== modified file 'components/WeatherConditionIconComponent.qml'
--- components/WeatherConditionIconComponent.qml	2013-04-21 18:05:01 +0000
+++ components/WeatherConditionIconComponent.qml	2013-05-18 11:01:26 +0000
@@ -18,7 +18,12 @@
     property bool __snow: false
     property bool __fog: false
 
-    onConditionChanged: weatherCondition.state = condition
+    onConditionChanged: {
+        // hotfix for inaccurate api data
+        // see http://bugs.openweathermap.org/issues/72
+        if(condition === "10") condition ="10d"
+        weatherCondition.state = condition
+    }
 
     Image {
         id: sun