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-local.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'mail/mail-local.c') diff --git a/mail/mail-local.c b/mail/mail-local.c index 14e2f15c85..960288e6e7 100644 --- a/mail/mail-local.c +++ b/mail/mail-local.c @@ -207,8 +207,7 @@ static char *get_name (CamelService *service, gboolean brief); static CamelFolder *get_folder (CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex); static CamelFolderInfo *get_folder_info (CamelStore *store, const char *top, - gboolean fast, gboolean recursive, - gboolean subscribed_only, CamelException *ex); + guint32 flags, CamelException *ex); static void delete_folder (CamelStore *store, const char *folder_name, CamelException *ex); static void rename_folder (CamelStore *store, const char *old_name, @@ -402,8 +401,7 @@ populate_folders (gpointer key, gpointer data, gpointer user_data) static CamelFolderInfo * get_folder_info (CamelStore *store, const char *top, - gboolean fast, gboolean recursive, - gboolean subscribed_only, CamelException *ex) + guint32 flags, CamelException *ex) { MailLocalStore *local_store = MAIL_LOCAL_STORE (store); CamelFolderInfo *fi = NULL; -- cgit v1.2.3