diff options
| author | Milan Crha <mcrha@redhat.com> | 2009-02-09 18:59:29 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@src.gnome.org> | 2009-02-09 18:59:29 +0800 |
| commit | f44568a253d5c798c71469b6e7d6fca905c0c356 (patch) | |
| tree | 1a02d2034585a656c8db9aba345ab45322636214 /mail/em-network-prefs.h | |
| parent | de1b9c79794d17fd5d953de81e24c7c1beadffbc (diff) | |
| download | gsoc2013-evolution-f44568a253d5c798c71469b6e7d6fca905c0c356.tar.gz gsoc2013-evolution-f44568a253d5c798c71469b6e7d6fca905c0c356.tar.zst gsoc2013-evolution-f44568a253d5c798c71469b6e7d6fca905c0c356.zip | |
** Part of fix for bug #555888
2009-02-09 Milan Crha <mcrha@redhat.com>
** 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
Diffstat (limited to 'mail/em-network-prefs.h')
| -rw-r--r-- | mail/em-network-prefs.h | 10 |
1 files changed, 6 insertions, 4 deletions
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 { |