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

[Colin Leroy]

Author: colin
Date: 2009-06-19 06:56:07 +0000 (Fri, 19 Jun 2009)
New Revision: 7616

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

	* panel-plugin/weather.c: Don't require 'http://' to be in the $HTTP_PROXY
	environment variable.



Modified: xfce4-weather-plugin/trunk/ChangeLog
===================================================================
--- xfce4-weather-plugin/trunk/ChangeLog	2009-06-18 22:03:26 UTC (rev 7615)
+++ xfce4-weather-plugin/trunk/ChangeLog	2009-06-19 06:56:07 UTC (rev 7616)
@@ -1,3 +1,8 @@
+2009-06-19	Colin Leroy <colin at colino.net>
+
+	* panel-plugin/weather.c: Don't require 'http://' to be in the $HTTP_PROXY
+	environment variable.
+
 2009-06-18	Colin Leroy <colin at colino.net>
 
 	* panel-plugin/*: Use ipinfodb.com to automatically set the location at

Modified: xfce4-weather-plugin/trunk/panel-plugin/weather.c
===================================================================
--- xfce4-weather-plugin/trunk/panel-plugin/weather.c	2009-06-18 22:03:26 UTC (rev 7615)
+++ xfce4-weather-plugin/trunk/panel-plugin/weather.c	2009-06-19 06:56:07 UTC (rev 7616)
@@ -62,11 +62,13 @@
 
   tmp = strstr (env_proxy, "://");
 
-  if (!tmp || strlen (tmp) < 3)
+  if (!tmp)
+    tmp = env_proxy;
+  else if (strlen (tmp) >= 3)
+    env_proxy = tmp + 3;
+  else
     return FALSE;
 
-  env_proxy = tmp + 3;
-
   /* we don't support username:password so return */
   tmp = strchr (env_proxy, '@');
   if (tmp)