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

[Nick Schermer]

Author: nick
Date: 2007-11-18 10:25:46 +0000 (Sun, 18 Nov 2007)
New Revision: 3602

Modified:
   xfce4-weather-plugin/trunk/ChangeLog
   xfce4-weather-plugin/trunk/panel-plugin/weather-http.c
Log:
	
	* Replace g_error with g_warning to avoid aborts.
	* Fix indents in ChangeLog.
	
	* Code cleanups.
	* Fix problem with requests.
	
	* Make the panel dialog icon 48x48 pixels (Bug #3513).

Modified: xfce4-weather-plugin/trunk/ChangeLog
===================================================================
--- xfce4-weather-plugin/trunk/ChangeLog	2007-11-17 14:32:18 UTC (rev 3601)
+++ xfce4-weather-plugin/trunk/ChangeLog	2007-11-18 10:25:46 UTC (rev 3602)
@@ -1,35 +1,41 @@
-2007-09-14  Nick Schermer <nick at xfce.org>
-    * Code cleanups.
-    * Fix problem with requests.
+2007-11-18	Nick Schermer <nick at xfce.org>
+	
+	* Replace g_error with g_warning to avoid aborts.
+	* Fix indents in ChangeLog.
 
-2007-09-12  Nick Schermer <nick at xfce.org>
+2007-09-14	Nick Schermer <nick at xfce.org>
+	
+	* Code cleanups.
+	* Fix problem with requests.
 
+2007-09-12	Nick Schermer <nick at xfce.org>
+
     * Add fully threaded data update, prevent loops, timeout check,
       better data handling, no cache file. Reschedule an update when
       there is no connection (up to 5 times).
     * Merge new strings (warnings and errors only).
 
-2007-09-10  Nick Schermer <nick at xfce.org>
+2007-09-10	Nick Schermer <nick at xfce.org>
+	
+	* Make the panel dialog icon 48x48 pixels (Bug #3513).
 
-    * Make the panel dialog icon 48x48 pixels (Bug #3513).
+2007-05-26	Nick Schermer <nick at xfce.org>
 
-2007-05-26  Nick Schermer <nick at xfce.org>
-
 	* Improve icon loading. When you remove all the labels the
 	  icon will fill the entire panel. The icon size is also
 	  pixel based, not linked to the GtkIconSize anymore (Bug #3232).
 	* Hide the event box window in the summary dialog, this looks
 	  better with most themes.
 
-2007-05-26  Nick Schermer <nick at xfce.org>
+2007-05-26	Nick Schermer <nick at xfce.org>
 
 	* Commit fix from bug #2934 to fix the location search.
 
-2007-05-26  Nick Schermer <nick at xfce.org>
+2007-05-26 	Nick Schermer <nick at xfce.org>
 
 	* Make the plugin working on FreeBSD. Patch by Stephen Hurd.
 
-2007-03-14  Nick Schermer <nick at xfce.org>
+2007-03-14	Nick Schermer <nick at xfce.org>
 
 	* Hide the ebox window, so you can see the panel background.
 	* Don't crash when no icons were found.

Modified: xfce4-weather-plugin/trunk/panel-plugin/weather-http.c
===================================================================
--- xfce4-weather-plugin/trunk/panel-plugin/weather-http.c	2007-11-17 14:32:18 UTC (rev 3601)
+++ xfce4-weather-plugin/trunk/panel-plugin/weather-http.c	2007-11-18 10:25:46 UTC (rev 3602)
@@ -155,8 +155,8 @@
   connection->fd = socket (PF_INET, SOCK_STREAM, 0);
   if (G_UNLIKELY (connection->fd < 0))
     {
-      /* display error */
-      g_error (_("Failed to open the socket (%s)."), g_strerror (errno));
+      /* display warning */
+      g_warning (_("Failed to open the socket (%s)."), g_strerror (errno));
 
       /* set status */
       connection->status = STATUS_ERROR;
@@ -177,8 +177,8 @@
   m = connect (connection->fd, (struct sockaddr *)&sockaddr, sizeof(struct sockaddr));
   if (G_UNLIKELY (m < 0))
     {
-      /* display error */
-      g_error (_("Failed to create a connection with the host (%s)."), g_strerror (errno));
+      /* display warning */
+      g_warning (_("Failed to create a connection with the host (%s)."), g_strerror (errno));
 
       /* set status */
       connection->status = STATUS_ERROR;
@@ -210,8 +210,8 @@
           /* just try again on EAGAIN/EINTR */
           if (G_LIKELY (errno != EAGAIN && errno != EINTR))
             {
-              /* display error */
-              g_error (_("Failed to send the request (%s)."), g_strerror (errno));
+              /* display warning */
+              g_warning (_("Failed to send the request (%s)."), g_strerror (errno));
 
               /* cleanup the request */
               g_free (request);
@@ -247,8 +247,8 @@
       /* check for problems */
       if (G_UNLIKELY (bytes < 0))
         {
-          /* display error */
-          g_error (_("Failed to receive data (%s)"), g_strerror (errno));
+          /* display warning */
+          g_warning (_("Failed to receive data (%s)"), g_strerror (errno));
 
           /* set status */
           connection->status = STATUS_ERROR;
@@ -288,8 +288,8 @@
         }
       else
         {
-          /* display error */
-          g_error (_("Unable to detect the content length."));
+          /* display warning */
+          g_warning (_("Unable to detect the content length."));
 
           /* set status */
           connection->status = STATUS_ERROR;
@@ -297,7 +297,7 @@
     }
   else
     {
-      g_error (_("No content received."));
+      g_warning (_("No content received."));
 
       /* set status */
       connection->status = STATUS_ERROR;