diff options
| -rw-r--r-- | mail/ChangeLog | 8 | ||||
| -rw-r--r-- | mail/mail-accounts.c | 11 | ||||
| -rw-r--r-- | mail/mail-accounts.h | 1 | ||||
| -rw-r--r-- | mail/mail-config.glade | 14 | ||||
| -rw-r--r-- | mail/mail-format.c | 1 |
5 files changed, 35 insertions, 0 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 935cf4437d..b68f4678c8 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,11 @@ +2001-10-05 Jon Trowbridge <trow@ximian.com> + + * mail-config.glade: Add toggle button to config menu to turn the + "confirm sending unwanted HTML" dialog on/off. (Bug 10794) + + * mail-accounts.c (construct): Make said toggle button actually + work. + 2001-10-05 Jeffrey Stedfast <fejj@ximian.com> * mail-callbacks.c (e_gnome_dialog_set_parent): New convenience diff --git a/mail/mail-accounts.c b/mail/mail-accounts.c index bd125de1fa..a650d53336 100644 --- a/mail/mail-accounts.c +++ b/mail/mail-accounts.c @@ -686,6 +686,12 @@ prompt_bcc_only_toggled (GtkWidget *toggle, gpointer data) mail_config_set_prompt_only_bcc (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (toggle))); } +static void +prompt_unwanted_html_toggled (GtkWidget *toggle, gpointer data) +{ + mail_config_set_confirm_unwanted_html (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 @@ -876,6 +882,11 @@ construct (MailAccountsDialog *dialog) gtk_toggle_button_set_active (dialog->prompt_bcc_only, mail_config_get_prompt_only_bcc ()); gtk_signal_connect (GTK_OBJECT (dialog->prompt_bcc_only), "toggled", GTK_SIGNAL_FUNC (prompt_bcc_only_toggled), dialog); + + dialog->prompt_unwanted_html = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkPromptWantHTML")); + gtk_toggle_button_set_active (dialog->prompt_unwanted_html, mail_config_get_confirm_unwanted_html ()); + gtk_signal_connect (GTK_OBJECT (dialog->prompt_unwanted_html), "toggled", + GTK_SIGNAL_FUNC (prompt_unwanted_html_toggled), dialog); /* Other page */ dialog->pgp_path = GNOME_FILE_ENTRY (glade_xml_get_widget (gui, "filePgpPath")); diff --git a/mail/mail-accounts.h b/mail/mail-accounts.h index e9e4423807..becdf5dad7 100644 --- a/mail/mail-accounts.h +++ b/mail/mail-accounts.h @@ -86,6 +86,7 @@ struct _MailAccountsDialog { GtkOptionMenu *charset; GtkToggleButton *prompt_empty_subject; GtkToggleButton *prompt_bcc_only; + GtkToggleButton *prompt_unwanted_html; /* Other page */ GtkToggleButton *empty_trash; diff --git a/mail/mail-config.glade b/mail/mail-config.glade index 3b3b0659c9..1c8d99e297 100644 --- a/mail/mail-config.glade +++ b/mail/mail-config.glade @@ -2887,6 +2887,20 @@ Quoted <fill>False</fill> </child> </widget> + + <widget> + <class>GtkCheckButton</class> + <name>chkPromptWantHTML</name> + <can_focus>True</can_focus> + <label>Prompt when sending HTML messages to contacts that don't want them</label> + <active>False</active> + <draw_indicator>True</draw_indicator> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> + </widget> </widget> <widget> diff --git a/mail/mail-format.c b/mail/mail-format.c index 5cfaa4f63a..5a8192f38c 100644 --- a/mail/mail-format.c +++ b/mail/mail-format.c @@ -859,6 +859,7 @@ write_address (MailDisplay *md, const CamelInternetAddress *addr, const char *fi "<a href=\"mailto:%s\">%s</a>", addr_url, email_disp); } + } else { char *str; |