EMailFormatter: Simplify context allocation.

Replace the create_context() and free_context() class methods with a
"context_size" class member defaulting to sizeof(EMailFormatterContext).

EMailFormatter will use "context_size" to allocate a zero-filled slab of
heap memory.  Since EMailFormatterQuote is currently the only thing that
overrides the "context_size" (to append a "qf_flags" member), let's keep
this simple.

1 files changed, 10 insertions, 12 deletions

diff --git a/em-format/e-mail-formatter.h b/em-format/e-mail-formatter.h
index 9b4e84d262..d7e578f794 100644
--- a/em-format/e-mail-formatter.h
+++ b/em-format/e-mail-formatter.h
@@ -114,22 +114,20 @@ struct _EMailFormatterClass {
 	/* Colors should apply globally */
 	GdkColor colors[E_MAIL_FORMATTER_NUM_COLOR_TYPES];
 
-	void			(*run)			(EMailFormatter *formatter,
-							 EMailFormatterContext *context,
-							 CamelStream *stream,
-							 GCancellable *cancellable);
+	/* sizeof(EMailFormatterContext) or some derivative struct */
+	gsize context_size;
 
-	EMailFormatterContext *	(*create_context)	(EMailFormatter *formatter);
-
-	void			(*free_context)		(EMailFormatter *formatter,
-							 EMailFormatterContext *context);
+	void		(*run)			(EMailFormatter *formatter,
+						 EMailFormatterContext *context,
+						 CamelStream *stream,
+						 GCancellable *cancellable);
 
-	void			(*set_style)		(EMailFormatter *formatter,
-							 GtkStyle *style,
-							 GtkStateType state);
+	void		(*set_style)		(EMailFormatter *formatter,
+						 GtkStyle *style,
+						 GtkStateType state);
 
 	/* Signals */
-	void			(*need_redraw)		(EMailFormatter *formatter);
+	void		(*need_redraw)		(EMailFormatter *formatter);
 };
 
 GType		e_mail_formatter_get_type	(void);