diff options
author | Matthew Barnes <mbarnes@src.gnome.org> | 2009-02-15 11:27:31 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@src.gnome.org> | 2009-02-15 11:27:31 +0800 |
commit | f7e298665b02f72890c6681e6d21ef5601beccbb (patch) | |
tree | 4df0be16faf8d03b1881bd5f9e89280195ec341c /mail/em-network-prefs.h | |
parent | ccd8e3964f548798eb05a430b3ea81b2760069cc (diff) | |
download | gsoc2013-evolution-f7e298665b02f72890c6681e6d21ef5601beccbb.tar.gz gsoc2013-evolution-f7e298665b02f72890c6681e6d21ef5601beccbb.tar.zst gsoc2013-evolution-f7e298665b02f72890c6681e6d21ef5601beccbb.zip |
Merge revisions 37200:3266 from trunk.
svn path=/branches/kill-bonobo/; revision=37270
Diffstat (limited to 'mail/em-network-prefs.h')
-rw-r--r-- | mail/em-network-prefs.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/mail/em-network-prefs.h b/mail/em-network-prefs.h index 41b4539608..50d986c5d1 100644 --- a/mail/em-network-prefs.h +++ b/mail/em-network-prefs.h @@ -69,14 +69,12 @@ struct _EMNetworkPrefs { GtkToggleButton *sys_proxy; GtkToggleButton *no_proxy; GtkToggleButton *manual_proxy; - GtkToggleButton *auto_proxy; GtkToggleButton *use_auth; GtkEntry *http_host; GtkEntry *https_host; GtkEntry *socks_host; GtkEntry *ignore_hosts; - GtkEntry *auto_proxy_url; GtkEntry *auth_user; GtkEntry *auth_pwd; @@ -85,14 +83,13 @@ struct _EMNetworkPrefs { GtkLabel *lbl_https_host; GtkLabel *lbl_https_port; GtkLabel *lbl_socks_host; - GtkLabel *lbl_socks_port; + GtkLabel *lbl_socks_port; GtkLabel *lbl_ignore_hosts; GtkLabel *lbl_auth_user; GtkLabel *lbl_auth_pwd; GtkSpinButton *http_port; GtkSpinButton *https_port; - GtkSpinButton *socks_port; }; struct _EMNetworkPrefsClass { |