Rename the "PGP" page back to "Other" and add a "default charset" option

	* mail-config.glade: Rename the "PGP" page back to "Other" and add
	a "default charset" option menu.

	* mail-config.c (config_read, mail_config_write_on_exit,
	mail_config_get_default_charset, mail_config_set_default_charset):
	Handle "default charset".

	* mail-accounts.c (construct): Fill in the "default_charset" menu
	with an e_charset_picker menu.
	(charset_menu_deactivate): Update the default charset.

svn path=/trunk/; revision=10057

1 files changed, 1 insertions, 0 deletions

diff --git a/mail/mail-accounts.h b/mail/mail-accounts.h
index 91de24e6d1..be7898ad8c 100644
--- a/mail/mail-accounts.h
+++ b/mail/mail-accounts.h
@@ -81,6 +81,7 @@ struct _MailAccountsDialog {
 	/* Composer page */
 	GtkToggleButton *send_html;
 	GtkOptionMenu *forward_style;
+	GtkOptionMenu *charset;
 
 	/* PGP page */
 	GnomeFileEntry *pgp_path;