aboutsummaryrefslogtreecommitdiffstats
path: root/e-util
diff options
context:
space:
mode:
authorRodney Dawes <dobey@ximian.com>2003-03-04 02:03:37 +0800
committerRodney Dawes <dobey@src.gnome.org>2003-03-04 02:03:37 +0800
commit93f4a723188932e8e9feb9eb87c9b26a69217f23 (patch)
treefd9935c3cd2f4e31290b3ae1b989536e9b202754 /e-util
parent38f63aa15d78d48afe4fc9328250ac290db75ddc (diff)
downloadgsoc2013-evolution-93f4a723188932e8e9feb9eb87c9b26a69217f23.tar
gsoc2013-evolution-93f4a723188932e8e9feb9eb87c9b26a69217f23.tar.gz
gsoc2013-evolution-93f4a723188932e8e9feb9eb87c9b26a69217f23.tar.bz2
gsoc2013-evolution-93f4a723188932e8e9feb9eb87c9b26a69217f23.tar.lz
gsoc2013-evolution-93f4a723188932e8e9feb9eb87c9b26a69217f23.tar.xz
gsoc2013-evolution-93f4a723188932e8e9feb9eb87c9b26a69217f23.tar.zst
gsoc2013-evolution-93f4a723188932e8e9feb9eb87c9b26a69217f23.zip
Use gnome2 proxy settings
2003-03-03 Rodney Dawes <dobey@ximian.com> * e-proxy.c: Use gnome2 proxy settings svn path=/trunk/; revision=20124
Diffstat (limited to 'e-util')
-rw-r--r--e-util/ChangeLog4
-rw-r--r--e-util/e-proxy.c16
2 files changed, 12 insertions, 8 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index af3aea3e52..5420403165 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-03 Rodney Dawes <dobey@ximian.com>
+
+ * e-proxy.c: Use gnome2 proxy settings
+
2003-03-02 Rodney Dawes <dobey@ximian.com>
* e-pilot-util.c: s/gnome-xml/libxml/
diff --git a/e-util/e-proxy.c b/e-util/e-proxy.c
index 469db70ba3..f47231c84c 100644
--- a/e-util/e-proxy.c
+++ b/e-util/e-proxy.c
@@ -42,18 +42,18 @@ set_proxy (GConfClient *client)
gboolean use_auth, use_proxy;
int proxy_port;
- use_proxy = gconf_client_get_bool (client, "/system/gnome-vfs/use-http-proxy", NULL);
+ use_proxy = gconf_client_get_bool (client, "/system/http_proxy/use_http_proxy", NULL);
if (use_proxy == FALSE) {
return;
}
- proxy_server = gconf_client_get_string (client, "/system/gnome-vfs/http-proxy-host", NULL);
- proxy_port = gconf_client_get_int (client, "/system/gnome-vfs/http-proxy-port", NULL);
+ proxy_server = gconf_client_get_string (client, "/system/http_proxy/host", NULL);
+ proxy_port = gconf_client_get_int (client, "/system/http_proxy/port", NULL);
- use_auth = gconf_client_get_bool (client, "/system/gnome-vfs/use-http-proxy-authorization", NULL);
+ use_auth = gconf_client_get_bool (client, "/system/http_proxy/use_authentication", NULL);
if (use_auth == TRUE) {
- proxy_user = gconf_client_get_string (client, "/system/gnome-vfs/http-proxy-authorization-user", NULL);
- proxy_pw = gconf_client_get_string (client, "/system/gnome-vfs/http-proxy-authorization-password", NULL);
+ proxy_user = gconf_client_get_string (client, "/system/http_proxy/authentication_user", NULL);
+ proxy_pw = gconf_client_get_string (client, "/system/http_proxy/authentication_password", NULL);
uri = g_strdup_printf ("http://%s:%s@%s:%d", proxy_user, proxy_pw, proxy_server, proxy_port);
} else {
@@ -86,10 +86,10 @@ e_proxy_init ()
return;
/* Listen to the changes in the gnome-vfs path */
- gconf_client_add_dir (client, "/system/gnome-vfs",
+ gconf_client_add_dir (client, "/system/http_proxy",
GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
- gconf_client_notify_add (client, "/system/gnome-vfs/",
+ gconf_client_notify_add (client, "/system/http_proxy/",
proxy_setting_changed, NULL, NULL, NULL);
set_proxy (client);