From f44568a253d5c798c71469b6e7d6fca905c0c356 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 9 Feb 2009 10:59:29 +0000 Subject: ** Part of fix for bug #555888 2009-02-09 Milan Crha ** Part of fix for bug #555888 * mail-config.glade: * em-network-prefs.h: (struct _EMNetworkPrefs): * em-network-prefs.c: (emnp_parse_ignore_hosts), (emnp_load_sys_settings), (notify_proxy_type_changed), (em_network_prefs_construct): Do not overwrite user settings with system proxy settings. Register signals at the end, when all widgets are read. Hide socks settings, it is not used at the moment. * em-utils.h: (em_utils_get_proxy_uri): * em-utils.c: (em_utils_get_proxy_uri), (emu_proxy_setup): * em-format-html.c: (emfh_gethttp): Use proxy configurable within Evolution. svn path=/trunk/; revision=37236 --- mail/em-network-prefs.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'mail/em-network-prefs.h') diff --git a/mail/em-network-prefs.h b/mail/em-network-prefs.h index f3125a1360..27c4e77685 100644 --- a/mail/em-network-prefs.h +++ b/mail/em-network-prefs.h @@ -70,7 +70,6 @@ struct _EMNetworkPrefs { struct _GtkEntry *http_host; struct _GtkEntry *https_host; - struct _GtkEntry *socks_host; struct _GtkEntry *ignore_hosts; #if 0 struct _GtkEntry *auto_proxy_url; @@ -82,15 +81,18 @@ struct _EMNetworkPrefs { struct _GtkLabel *lbl_http_port; struct _GtkLabel *lbl_https_host; struct _GtkLabel *lbl_https_port; - struct _GtkLabel *lbl_socks_host; - struct _GtkLabel *lbl_socks_port; struct _GtkLabel *lbl_ignore_hosts; struct _GtkLabel *lbl_auth_user; struct _GtkLabel *lbl_auth_pwd; struct _GtkSpinButton *http_port; struct _GtkSpinButton *https_port; - struct _GtkSpinButton *socks_port; +#if 0 + struct _GtkLabel *lbl_socks_host; + struct _GtkEntry *socks_host; + struct _GtkLabel *lbl_socks_port; + struct _GtkSpinButton *socks_port; +#endif }; struct _EMNetworkPrefsClass { -- cgit v1.2.3