File fate-301013-auth-proxy.patch of Package evolution-data-server-2.6

Overview Repositories Revisions Requests Users Attributes Meta

File fate-301013-auth-proxy.patch of Package evolution-data-server-2.6

--- libedataserver/e-proxy.c~	2006-12-21 09:11:59.000000000 +0530
+++ libedataserver/e-proxy.c	2007-01-15 10:50:29.000000000 +0530
@@ -44,17 +44,19 @@
 #define d(x)
 
 /* GConf paths and keys */
-#define PATH_GCONF_GNOME_VFS "/system/http_proxy"
-#define KEY_GCONF_HTTP_PROXY_PORT (PATH_GCONF_GNOME_VFS "/" "port")
-#define KEY_GCONF_HTTP_PROXY_HOST (PATH_GCONF_GNOME_VFS "/" "host")
+#define PATH_GCONF_NETWORK_CONFIG "/apps/evolution/shell/network_config"
+#define KEY_GCONF_HTTP_PROXY_PORT (PATH_GCONF_NETWORK_CONFIG "/" "http_port")
+#define KEY_GCONF_HTTP_PROXY_HOST (PATH_GCONF_NETWORK_CONFIG "/" "http_host")
+#define KEY_GCONF_HTTPS_PROXY_PORT (PATH_GCONF_NETWORK_CONFIG "/" "secure_port")
+#define KEY_GCONF_HTTPS_PROXY_HOST (PATH_GCONF_NETWORK_CONFIG "/" "secure_host")
+#define KEY_GCONF_SOCKS_PROXY_PORT (PATH_GCONF_NETWORK_CONFIG "/" "socks_port")
+#define KEY_GCONF_SOCKS_PROXY_HOST (PATH_GCONF_NETWORK_CONFIG "/" "socks_host")
+#define KEY_GCONF_USE_HTTP_PROXY (PATH_GCONF_NETWORK_CONFIG "/" "use_http_proxy")
+#define KEY_GCONF_HTTP_AUTH_USER (PATH_GCONF_NETWORK_CONFIG "/" "authentication_user")
+#define KEY_GCONF_HTTP_AUTH_PW   (PATH_GCONF_NETWORK_CONFIG "/" "authentication_password")
+#define KEY_GCONF_HTTP_USE_AUTH (PATH_GCONF_NETWORK_CONFIG "/" "use_authentication")
 
-#define KEY_GCONF_USE_HTTP_PROXY (PATH_GCONF_GNOME_VFS "/" "use_http_proxy")
-
-#define KEY_GCONF_HTTP_AUTH_USER (PATH_GCONF_GNOME_VFS "/" "authentication_user")
-#define KEY_GCONF_HTTP_AUTH_PW (PATH_GCONF_GNOME_VFS "/" "authentication_password")
-#define KEY_GCONF_HTTP_USE_AUTH (PATH_GCONF_GNOME_VFS "/" "use_authentication")
-
-#define KEY_GCONF_HTTP_PROXY_IGNORE_HOSTS (PATH_GCONF_GNOME_VFS "/" "ignore_hosts")
+#define KEY_GCONF_HTTP_PROXY_IGNORE_HOSTS (PATH_GCONF_NETWORK_CONFIG "/" "ignore_hosts")
 
 struct _EProxyPrivate {
 	SoupUri* uri;
@@ -614,7 +616,7 @@ e_proxy_setup_proxy (EProxy* proxy)
 {
 	GConfClient *client;
 	
-	/* We get the gnome-vfs proxy keys here
+	/* We get the evolution-shell proxy keys here
 	   set soup up to use the proxy,
 	   and listen to any changes */
 	
@@ -624,12 +626,12 @@ e_proxy_setup_proxy (EProxy* proxy)
 	if (!proxy || !proxy->priv)
 		return;
 
-	/* Listen to the changes in the gnome-vfs path */
-	gconf_client_add_dir (client, PATH_GCONF_GNOME_VFS,
+	/* Listen to the changes in the evolution-shell path */
+	gconf_client_add_dir (client, PATH_GCONF_NETWORK_CONFIG,
 			      GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
 
 	if (proxy->priv->notify_id == 0)
-		proxy->priv->notify_id = gconf_client_notify_add (client, PATH_GCONF_GNOME_VFS,
+		proxy->priv->notify_id = gconf_client_notify_add (client, PATH_GCONF_NETWORK_CONFIG,
 								  ep_setting_changed, (gpointer)proxy, 
 								  NULL, NULL);

Places

File fate-301013-auth-proxy.patch of Package evolution-data-server-2.6

Places