diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-07-02 00:16:23 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-07-02 02:39:23 +0800 |
| commit | b554b165941e9b4e394554591e93e31e5accef16 (patch) | |
| tree | 4232dc565d325a6f5b3c67081fb484c99055d092 /modules/mail/em-mailer-prefs.h | |
| parent | 1351c8e4fb443a9705bb1225c3c574c05a36f8ca (diff) | |
| download | gsoc2013-evolution-b554b165941e9b4e394554591e93e31e5accef16.tar.gz gsoc2013-evolution-b554b165941e9b4e394554591e93e31e5accef16.tar.zst gsoc2013-evolution-b554b165941e9b4e394554591e93e31e5accef16.zip | |
Fix merge issues in EMAccountEditor.
Diffstat (limited to 'modules/mail/em-mailer-prefs.h')
| -rw-r--r-- | modules/mail/em-mailer-prefs.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/modules/mail/em-mailer-prefs.h b/modules/mail/em-mailer-prefs.h index b33e620392..e35c2085ab 100644 --- a/modules/mail/em-mailer-prefs.h +++ b/modules/mail/em-mailer-prefs.h @@ -71,11 +71,6 @@ struct _EMMailerPrefs { GtkSpinButton *timeout; GtkOptionMenu *charset; - /* Deleting Mail */ - GtkToggleButton *empty_trash; - GtkComboBox *empty_trash_days; - GtkToggleButton *confirm_expunge; - /* HTML Mail tab */ GtkFontButton *font_variable; GtkFontButton *font_fixed; @@ -103,10 +98,6 @@ struct _EMMailerPrefs { GtkTreeView *header_list; GtkListStore *header_list_store; - /* Junk prefs */ - GtkToggleButton *empty_junk; - GtkComboBox *empty_junk_days; - GtkToggleButton *sa_local_tests_only; GtkToggleButton *sa_use_daemon; GtkComboBox *default_junk_plugin; |