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

Colin Leroy colin at xfce.org
Sun Jul 19 22:55:22 CEST 2009


Author: colin
Date: 2009-07-19 20:55:22 +0000 (Sun, 19 Jul 2009)
New Revision: 7747

Modified:
   xfce4-weather-plugin/trunk/ChangeLog
   xfce4-weather-plugin/trunk/panel-plugin/weather-http.c
Log:
2009-07-19	Colin Leroy <colin at colino.net>

	* panel-plugin/weather-http.c: Fix fd closing problem, where we could
	close stdout if _receive_data_idle() errors out early. Spotted and 
	patch by Johannes Stezenbach


Modified: xfce4-weather-plugin/trunk/ChangeLog
===================================================================
--- xfce4-weather-plugin/trunk/ChangeLog	2009-07-19 19:57:08 UTC (rev 7746)
+++ xfce4-weather-plugin/trunk/ChangeLog	2009-07-19 20:55:22 UTC (rev 7747)
@@ -1,3 +1,9 @@
+2009-07-19	Colin Leroy <colin at colino.net>
+
+	* panel-plugin/weather-http.c: Fix fd closing problem, where we could
+	close stdout if _receive_data_idle() errors out early. Spotted and 
+	patch by Johannes Stezenbach
+
 2009-07-07	Colin Leroy <colin at colino.net>
 
 	* panel-plugin/weather.c: Finish fixing bug 5505, 'some strings are not 

Modified: xfce4-weather-plugin/trunk/panel-plugin/weather-http.c
===================================================================
--- xfce4-weather-plugin/trunk/panel-plugin/weather-http.c	2009-07-19 19:57:08 UTC (rev 7746)
+++ xfce4-weather-plugin/trunk/panel-plugin/weather-http.c	2009-07-19 20:55:22 UTC (rev 7747)
@@ -389,7 +389,7 @@
   WeatherConnection *connection = user_data;
 
   /* close the socket */
-  if (connection->fd != -1)
+  if (connection->fd >= 0)
     {
       close (connection->fd);
       connection->fd = -1;
@@ -472,7 +472,7 @@
   connection->cb_user_data = user_data;
   connection->status = STATUS_NOT_EXECUTED;
   connection->received = NULL;
-  connection->fd = 0;
+  connection->fd = -1;
   connection->counter = 1;
 
   /* start idle function */




More information about the Goodies-commits mailing list