Save the pgp and smime settings. (mail_account_gui_new): Setup the pgp and

2001-06-01  Jeffrey Stedfast  <fejj@ximian.com>

	* mail-account-gui.c (mail_account_gui_save): Save the pgp and
	smime settings.
	(mail_account_gui_new): Setup the pgp and s/mime page (but disable
	the s/mime frame if we are not compiled with s/mime support).

	* mail-config.c (account_copy): Updated to save extra pgp and
	smime options.
	(account_destroy): Free draft/sent folder info and also the new
	pgp/smime keys.
	(config_read): Read in the pgp and s/mime config options.
	(mail_config_write): Save the account pgp and smime options.

svn path=/trunk/; revision=10084

1 files changed, 13 insertions, 7 deletions

diff --git a/mail/mail-account-gui.h b/mail/mail-account-gui.h
index 159743e475..f1989a4ec4 100644
--- a/mail/mail-account-gui.h
+++ b/mail/mail-account-gui.h
@@ -47,7 +47,7 @@ typedef struct {
 	GtkWidget *authitem;
 	GtkToggleButton *remember;
 	GtkButton *check_supported;
-
+	
 	CamelProvider *provider;
 	CamelProviderType provider_type;
 } MailAccountGuiService;
@@ -60,34 +60,40 @@ typedef struct {
 	GtkWidget *top;
 	MailConfigAccount *account;
 	GladeXML *xml;
-
+	
 	/* identity */
 	GtkEntry *full_name;
 	GtkEntry *email_address;
 	GtkEntry *organization;
 	GnomeFileEntry *signature;
-
+	
 	/* incoming mail */
 	MailAccountGuiService source;
 	GtkToggleButton *source_auto_check;
 	GtkSpinButton *source_auto_check_min;
-
+	
 	/* extra incoming config */
 	GHashTable *extra_config;
-
+	
 	/* outgoing mail */
 	MailAccountGuiService transport;
 	GtkToggleButton *transport_needs_auth;
-
+	
 	/* account management */
 	GtkEntry *account_name;
 	GtkToggleButton *default_account;
-
+	
 	/* special folders */
 	GtkButton *drafts_folder_button;
 	MailAccountGuiFolder drafts_folder;
 	GtkButton *sent_folder_button;
 	MailAccountGuiFolder sent_folder;
+	
+	/* Security */
+	GtkEntry *pgp_key;
+	GtkToggleButton *pgp_encrypt_to_self;
+	GtkEntry *smime_key;
+	GtkToggleButton *smime_encrypt_to_self;
 } MailAccountGui;