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, 3 insertions, 0 deletions

diff --git a/mail/mail-config.h b/mail/mail-config.h
index d242d032d1..bb4fb8fbce 100644
--- a/mail/mail-config.h
+++ b/mail/mail-config.h
@@ -137,6 +137,9 @@ void                   mail_config_set_default_forward_style (MailConfigForwardS
 MailConfigDisplayStyle mail_config_get_message_display_style (void);
 void                   mail_config_set_message_display_style (MailConfigDisplayStyle style);
 
+const char *mail_config_get_default_charset (void);
+void        mail_config_set_default_charset (const char *charset);
+
 const MailConfigAccount  *mail_config_get_default_account       (void);
 const MailConfigAccount  *mail_config_get_account_by_name       (const char *account_name);
 const MailConfigAccount  *mail_config_get_account_by_source_url (const char *url);