Updating branch refs/heads/master
to 85d9c7f0eab8f1c39a8cdd43bcaf82262779d80f (commit)
from a1f1a5966634853f7ba2ab5841bddbfe70ed0c3f (commit)
commit 85d9c7f0eab8f1c39a8cdd43bcaf82262779d80f
Author: Harald Judt <[email protected]>
Date: Tue Nov 20 20:08:26 2012 +0100
Check for upper- and lowercase proxy environment variables.
panel-plugin/weather-http.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/panel-plugin/weather-http.c b/panel-plugin/weather-http.c
index cfb81e1..e91a491 100644
--- a/panel-plugin/weather-http.c
+++ b/panel-plugin/weather-http.c
@@ -43,9 +43,10 @@ weather_http_queue_request(const gchar *uri,
WEATHER_MAX_CONN_TIMEOUT, NULL);
/* Set the proxy URI if any */
- proxy_uri = g_getenv("http_proxy");
-
- if (proxy_uri != NULL) {
+ proxy_uri = g_getenv("HTTP_PROXY");
+ if (!proxy_uri)
+ proxy_uri = g_getenv("http_proxy");
+ if (proxy_uri) {
soup_proxy_uri = soup_uri_new (proxy_uri);
g_object_set(session, SOUP_SESSION_PROXY_URI, soup_proxy_uri, NULL);
soup_uri_free(soup_proxy_uri);
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
