[Goodies-commits] r7549 - in xfce4-weather-plugin/trunk: . panel-plugin

[Colin Leroy]

Author: colin
Date: 2009-06-13 07:40:16 +0000 (Sat, 13 Jun 2009)
New Revision: 7549

Modified:
   xfce4-weather-plugin/trunk/ChangeLog
   xfce4-weather-plugin/trunk/panel-plugin/weather-icon.c
Log:
2009-06-13	Colin Leroy <colin at colino.net>

	* panel-plugin/weather-icon.c: fix bug #5456, "Icon unaccessible when 
	XOAP error". If we couldn't load an icon, load the default one (99).



Modified: xfce4-weather-plugin/trunk/ChangeLog
===================================================================
--- xfce4-weather-plugin/trunk/ChangeLog	2009-06-13 07:38:42 UTC (rev 7548)
+++ xfce4-weather-plugin/trunk/ChangeLog	2009-06-13 07:40:16 UTC (rev 7549)
@@ -1,5 +1,10 @@
 2009-06-13	Colin Leroy <colin at colino.net>
 
+	* panel-plugin/weather-icon.c: fix bug #5456, "Icon unaccessible when 
+	XOAP error". If we couldn't load an icon, load the default one (99).
+
+2009-06-13	Colin Leroy <colin at colino.net>
+
 	* panel-plugin/weather-summary.c: fix bug #5127, "Bug: Wireless: UMTS |
 	Improvement: Default: Forecast". The first part of it is probably fixed
 	by the fix to bug #4118, this addresses the second part: Forecast tab

Modified: xfce4-weather-plugin/trunk/panel-plugin/weather-icon.c
===================================================================
--- xfce4-weather-plugin/trunk/panel-plugin/weather-icon.c	2009-06-13 07:38:42 UTC (rev 7548)
+++ xfce4-weather-plugin/trunk/panel-plugin/weather-icon.c	2009-06-13 07:40:16 UTC (rev 7549)
@@ -44,9 +44,12 @@
 
   image = gdk_pixbuf_new_from_file_at_scale (filename, size, size, TRUE, NULL);
 
-  if (G_UNLIKELY (!image))
+  if (G_UNLIKELY (!image)) {
     g_warning ("Unable to open image: %s", filename);
-
+    if (number && strcmp(number, "99")) {
+      g_free(filename);
+      return get_icon("99", size);
+  }
   g_free (filename);
 
   return image;