From 38e751895d3a405598526765826f387ac962a0d1 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Mon, 15 Mar 2004 15:19:00 +0000 Subject: make this a varags function, which then calls the virtual method to do the 2004-03-15 Not Zed * em-format.c (em_format_format_error): make this a varags function, which then calls the virtual method to do the work. (emf_multipart_appledouble, emf_multipart_mixed) (emf_multipart_alternative, emf_multipart_related) (emf_message_rfc822): print an error to explain why you're getting source content displayed. (em_format_format_secure): make this a function. and if we're done formatting a secure part, and we dont have a parent anymore, null out the validity. See #55541. svn path=/trunk/; revision=25070 --- mail/em-format.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mail/em-format.h') diff --git a/mail/em-format.h b/mail/em-format.h index 4b3956f4c0..14db358e58 100644 --- a/mail/em-format.h +++ b/mail/em-format.h @@ -221,11 +221,11 @@ void em_format_pull_level(EMFormat *emf); ((EMFormat *)(emf))->uid, \ ((EMFormat *)(emf))->message, \ (emf)) -#define em_format_format_error(emf, stream, txt) ((EMFormatClass *)G_OBJECT_GET_CLASS(emf))->format_error((emf), (stream), (txt)) +void em_format_format_error(EMFormat *emf, struct _CamelStream *stream, const char *fmt, ...); #define em_format_format_attachment(emf, stream, msg, type, info) ((EMFormatClass *)G_OBJECT_GET_CLASS(emf))->format_attachment((emf), (stream), (msg), (type), (info)) #define em_format_format_message(emf, stream, msg) ((EMFormatClass *)G_OBJECT_GET_CLASS(emf))->format_message((emf), (stream), (msg)) #define em_format_format_source(emf, stream, msg) ((EMFormatClass *)G_OBJECT_GET_CLASS(emf))->format_source((emf), (stream), (msg)) -#define em_format_format_secure(emf, stream, msg, valid) ((EMFormatClass *)G_OBJECT_GET_CLASS(emf))->format_secure((emf), (stream), (msg), (valid)) +void em_format_format_secure(EMFormat *emf, struct _CamelStream *stream, struct _CamelMimePart *part, struct _CamelCipherValidity *valid); #define em_format_busy(emf) ((EMFormatClass *)G_OBJECT_GET_CLASS(emf))->busy((emf)) -- cgit v1.2.3