diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2001-09-26 08:09:09 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2001-09-26 08:09:09 +0800 |
| commit | f06f7a283659fa559e5377d015af65658ef73717 (patch) | |
| tree | 585a8d045a08583465d745ffaba71ac116c4bf3d /mail/mail-config.glade | |
| parent | 99949cdd3907da9d310fe4a8f8bf927fd4069e58 (diff) | |
| download | gsoc2013-evolution-f06f7a283659fa559e5377d015af65658ef73717.tar gsoc2013-evolution-f06f7a283659fa559e5377d015af65658ef73717.tar.gz gsoc2013-evolution-f06f7a283659fa559e5377d015af65658ef73717.tar.bz2 gsoc2013-evolution-f06f7a283659fa559e5377d015af65658ef73717.tar.lz gsoc2013-evolution-f06f7a283659fa559e5377d015af65658ef73717.tar.xz 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-config.glade')
| -rw-r--r-- | mail/mail-config.glade | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/mail/mail-config.glade b/mail/mail-config.glade index 42ad7ba248..0a64b23478 100644 --- a/mail/mail-config.glade +++ b/mail/mail-config.glade @@ -2932,20 +2932,6 @@ Quoted </widget> <widget> - <class>GtkCheckButton</class> - <name>chkRememberPGPPassphrase</name> - <can_focus>True</can_focus> - <label>_Remember PGP Passphrase until exit</label> - <active>True</active> - <draw_indicator>True</draw_indicator> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> - </widget> - - <widget> <class>GtkHBox</class> <name>hbox56</name> <homogeneous>False</homogeneous> @@ -3052,6 +3038,20 @@ Quoted </widget> </widget> </widget> + + <widget> + <class>GtkCheckButton</class> + <name>chkConfirmExpunge</name> + <can_focus>True</can_focus> + <label>Confirm when Expunging a folder</label> + <active>False</active> + <draw_indicator>True</draw_indicator> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>False</fill> + </child> + </widget> </widget> <widget> |