From f7e298665b02f72890c6681e6d21ef5601beccbb Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 15 Feb 2009 03:27:31 +0000 Subject: Merge revisions 37200:3266 from trunk. svn path=/branches/kill-bonobo/; revision=37270 --- mail/em-network-prefs.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'mail/em-network-prefs.h') 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 { -- cgit v1.2.3