From b9401bbdf43b51b3596498d12ba2d73e2cca1805 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Mon, 14 May 2001 17:18:03 +0000 Subject: Split "Other" page into three pages, Display, Composer, and PGP. Add HTML * mail-config.glade: Split "Other" page into three pages, Display, Composer, and PGP. Add HTML image stuff on the Display page and default forward style on the Composer page. * mail-config.c (mail_config_get_default_forward_style, mail_config_set_default_forward_style): User-specified default style for forwarding messages. (config_read, mail_config_write_on_exit): Deal with forward style. * mail-accounts.c: Handle HTML image display options and default forward style. * mail-callbacks.c (forward): New. Forward in the user-selected default style. (forward_inline, forward_quoted): Simplify these some. Remove the fallback to forward attached when forwarding multiple messages: it should just forward the multiple messages inline or quoted in those cases. (Which it doesn't yet, but that's a bug.) * folder-browser.c (context_menu): Remove "Forward inline" and make "Forward" call forward() rather than forward_attached(). * folder-browser-factory.c: Update command/menu/toolbar/pixmap gunk for the "MessageForwardAttached" vs "MessageForward" split. * mail-session.c (mail_session_get_type): * mail-format.c (format_mime_part): * mail-account-gui.c (setup_service): Fix warnings. svn path=/trunk/; revision=9792 --- mail/mail-config.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'mail/mail-config.h') diff --git a/mail/mail-config.h b/mail/mail-config.h index 31e31ddb2f..46b6e17035 100644 --- a/mail/mail-config.h +++ b/mail/mail-config.h @@ -64,6 +64,11 @@ typedef enum { MAIL_CONFIG_HTTP_ALWAYS, } MailConfigHTTPMode; +typedef enum { + MAIL_CONFIG_FORWARD_ATTACHED, MAIL_CONFIG_FORWARD_INLINE, + MAIL_CONFIG_FORWARD_QUOTED, +} MailConfigForwardStyle; + /* Identities */ MailConfigIdentity *identity_copy (const MailConfigIdentity *id); void identity_destroy (MailConfigIdentity *id); @@ -123,6 +128,9 @@ void mail_config_set_pgp_path (const char *pgp_path); MailConfigHTTPMode mail_config_get_http_mode (void); void mail_config_set_http_mode (MailConfigHTTPMode); +MailConfigForwardStyle mail_config_get_default_forward_style (void); +void mail_config_set_default_forward_style (MailConfigForwardStyle); + 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); -- cgit