diff options
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/mail-accounts.c | 6 | ||||
| -rw-r--r-- | mail/mail-accounts.h | 4 | ||||
| -rw-r--r-- | mail/mail-config.glade | 28 |
4 files changed, 13 insertions, 30 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 49ceaf5ee9..0f2de99021 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2001-09-28 Jeffrey Stedfast <fejj@ximian.com> + + * mail-accounts.c (construct): Don't create checkboxes for global + Threaded or Preview options as they are now removed. + 2001-09-28 <NotZed@Ximian.com> * component-factory.c (owner_set_cb): Setup vfolder storage before diff --git a/mail/mail-accounts.c b/mail/mail-accounts.c index 15228dc61a..0bc9191743 100644 --- a/mail/mail-accounts.c +++ b/mail/mail-accounts.c @@ -683,6 +683,8 @@ prompt_bcc_only_toggled (GtkWidget *toggle, gpointer data) mail_config_set_prompt_only_bcc (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (toggle))); } +#if 0 +/* Note: Please see construct() for a reason as to why these 2 options are disabled */ static void thread_list_toggled (GtkWidget *toggle, gpointer data) { @@ -694,6 +696,7 @@ show_preview_toggled (GtkWidget *toggle, gpointer data) { mail_config_set_show_preview (NULL, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (toggle))); } +#endif static void filter_log_toggled (GtkWidget *toggle, gpointer data) @@ -835,6 +838,8 @@ construct (MailAccountsDialog *dialog) gtk_signal_connect (GTK_OBJECT (dialog->images_always), "toggled", GTK_SIGNAL_FUNC (images_radio_toggled), dialog); +#if 0 + /* These options are disabled because they are completely non-intuitive and evil */ dialog->thread_list = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkThreadedList")); gtk_toggle_button_set_active (dialog->thread_list, mail_config_get_thread_list (NULL)); gtk_signal_connect (GTK_OBJECT (dialog->thread_list), "toggled", @@ -844,6 +849,7 @@ construct (MailAccountsDialog *dialog) gtk_toggle_button_set_active (dialog->show_preview, mail_config_get_show_preview (NULL)); gtk_signal_connect (GTK_OBJECT (dialog->show_preview), "toggled", GTK_SIGNAL_FUNC (show_preview_toggled), dialog); +#endif /* Composer page */ dialog->send_html = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkSendHTML")); diff --git a/mail/mail-accounts.h b/mail/mail-accounts.h index 38cc82e043..e9e4423807 100644 --- a/mail/mail-accounts.h +++ b/mail/mail-accounts.h @@ -77,8 +77,8 @@ struct _MailAccountsDialog { GtkToggleButton *timeout_toggle; GtkSpinButton *timeout; GtkToggleButton *images_always, *images_sometimes, *images_never; - GtkToggleButton *thread_list; - GtkToggleButton *show_preview; + /*GtkToggleButton *thread_list;*/ + /*GtkToggleButton *show_preview;*/ /* Composer page */ GtkToggleButton *send_html; diff --git a/mail/mail-config.glade b/mail/mail-config.glade index 4b383ce5e0..7fd41db234 100644 --- a/mail/mail-config.glade +++ b/mail/mail-config.glade @@ -2752,34 +2752,6 @@ Kerberos </widget> </widget> </widget> - - <widget> - <class>GtkCheckButton</class> - <name>chkThreadedList</name> - <can_focus>True</can_focus> - <label>Message list should display in a _threaded fashion by default</label> - <active>False</active> - <draw_indicator>True</draw_indicator> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> - </widget> - - <widget> - <class>GtkCheckButton</class> - <name>chkShowPreview</name> - <can_focus>True</can_focus> - <label>Message _preview should be displayed by default</label> - <active>True</active> - <draw_indicator>True</draw_indicator> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> - </widget> </widget> <widget> |