aboutsummaryrefslogtreecommitdiffstats
path: root/mail/mail-accounts.c
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2001-09-26 08:09:09 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2001-09-26 08:09:09 +0800
commitf06f7a283659fa559e5377d015af65658ef73717 (patch)
tree585a8d045a08583465d745ffaba71ac116c4bf3d /mail/mail-accounts.c
parent99949cdd3907da9d310fe4a8f8bf927fd4069e58 (diff)
downloadgsoc2013-evolution-f06f7a283659fa559e5377d015af65658ef73717.tar.gz
gsoc2013-evolution-f06f7a283659fa559e5377d015af65658ef73717.tar.zst
gsoc2013-evolution-f06f7a283659fa559e5377d015af65658ef73717.zip
Update to not send the remember-passphrase option to the context, it
2001-09-25 Jeffrey Stedfast <fejj@ximian.com> * mail-format.c (decode_pgp): Update to not send the remember-passphrase option to the context, it doesn't need it anymore. (try_inline_pgp_sig): Same. * mail-accounts.c (construct): The remember-passphrase option is no longer there. This can now be set on the passphrase prompt dialog. (construct): Add confirm expunge options. * mail-config.c (config_read): We no longer read-in the remember-passphrase state because we no longer need it. (mail_config_write_on_exit): We no longer save it either. (mail_config_get_remember_pgp_passphrase): Removed. (mail_config_set_remember_pgp_passphrase): Removed. * mail-crypto.c (mail_crypto_pgp_mime_part_sign): No longer do we need to send the remember passphrase state to the pgp context. (mail_crypto_pgp_mime_part_verify): Same. (mail_crypto_pgp_mime_part_encrypt): Here too. (mail_crypto_pgp_mime_part_decrypt): And here. svn path=/trunk/; revision=13139
Diffstat (limited to 'mail/mail-accounts.c')
-rw-r--r--mail/mail-accounts.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/mail/mail-accounts.c b/mail/mail-accounts.c
index 5e3086182d..15228dc61a 100644
--- a/mail/mail-accounts.c
+++ b/mail/mail-accounts.c
@@ -672,12 +672,6 @@ empty_trash_toggled (GtkWidget *toggle, gpointer data)
}
static void
-remember_pgp_passphrase_toggled (GtkWidget *toggle, gpointer data)
-{
- mail_config_set_remember_pgp_passphrase (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (toggle)));
-}
-
-static void
prompt_empty_subject_toggled (GtkWidget *toggle, gpointer data)
{
mail_config_set_prompt_empty_subject (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (toggle)));
@@ -708,6 +702,12 @@ filter_log_toggled (GtkWidget *toggle, gpointer data)
}
static void
+confirm_expunge_toggled (GtkWidget *toggle, gpointer data)
+{
+ mail_config_set_confirm_expunge (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (toggle)));
+}
+
+static void
forward_style_activated (GtkWidget *item, gpointer data)
{
int style = GPOINTER_TO_INT (data);
@@ -876,11 +876,6 @@ construct (MailAccountsDialog *dialog)
gtk_signal_connect (GTK_OBJECT (gnome_file_entry_gtk_entry (dialog->pgp_path)),
"changed", GTK_SIGNAL_FUNC (pgp_path_changed), dialog);
- dialog->remember_passwd = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkRememberPGPPassphrase"));
- gtk_toggle_button_set_active (dialog->remember_passwd, mail_config_get_remember_pgp_passphrase ());
- gtk_signal_connect (GTK_OBJECT (dialog->remember_passwd), "toggled",
- GTK_SIGNAL_FUNC (remember_pgp_passphrase_toggled), dialog);
-
dialog->charset = GTK_OPTION_MENU (glade_xml_get_widget (gui, "omenuCharset"));
menu = e_charset_picker_new (mail_config_get_default_charset ());
gtk_option_menu_set_menu (dialog->charset, GTK_WIDGET (menu));
@@ -904,6 +899,11 @@ construct (MailAccountsDialog *dialog)
gtk_signal_connect (GTK_OBJECT (gnome_file_entry_gtk_entry (dialog->filter_log_path)),
"changed", GTK_SIGNAL_FUNC (filter_log_path_changed), dialog);
+ dialog->confirm_expunge = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkConfirmExpunge"));
+ gtk_toggle_button_set_active (dialog->confirm_expunge, mail_config_get_confirm_expunge ());
+ gtk_signal_connect (GTK_OBJECT (dialog->confirm_expunge), "toggled",
+ GTK_SIGNAL_FUNC (confirm_expunge_toggled), dialog);
+
/* now to fill in the clists */
dialog->accounts_row = -1;
dialog->accounts = mail_config_get_accounts ();