Merge lp:~roignac/ubuntu/oneiric/indicator-weather/lp_886028 into lp:ubuntu/oneiric/indicator-weather

[Vadim Rutkovsky]

Backporting the fix for bug #886026, which broke soem cities and forecasts

Unmerged revisions

35. By Vadim Rutkovsky on 2011-12-10

Applied patch, which handles Unknown wind info correctly. Many thanks to Tomasz Maciejewski

=== modified file 'bin/indicator-weather'
--- bin/indicator-weather	2011-07-12 01:44:53 +0000
+++ bin/indicator-weather	2011-12-10 10:56:26 +0000
@@ -833,9 +833,7 @@
                 wind_info = self.__report['current_conditions']['wind_condition'].split(' ')
                 wind_speed = wind_info[3]
             else:
-                wind_direction = _("Unknown")
-                wind_info = _("Unknown")
-                wind_speed = _("Unknown")
+                return _("Unknown")
 
         if self.__weather_datasource == WeatherDataSource.YAHOO:
             # Create a similar to Google wind_info structure from Yahoo data