Convert EMailFormatterExtension to an abstract class.

With the previous changes, all formatter extensions derive from
GObjectClass and implement the EMailFormatterExtensionInterface.

Simplify things further by making EMailFormatterExtension an abstract
base class so formatter extensions are now just direct subclasses and
need not bother with implementing GObject interfaces.

1 files changed, 10 insertions, 28 deletions

diff --git a/em-format/e-mail-formatter-quote-attachment.c b/em-format/e-mail-formatter-quote-attachment.c
index 0dcf5f0206..4a48a84dc0 100644
--- a/em-format/e-mail-formatter-quote-attachment.c
+++ b/em-format/e-mail-formatter-quote-attachment.c
@@ -33,25 +33,13 @@
 
 #define d(x)
 
-typedef struct _EMailFormatterQuoteAttachment {
-	GObject parent;
-} EMailFormatterQuoteAttachment;
+typedef EMailFormatterExtension EMailFormatterQuoteAttachment;
+typedef EMailFormatterExtensionClass EMailFormatterQuoteAttachmentClass;
 
-typedef struct _EMailFormatterQuoteAttachmentClass {
-	GObjectClass parent_class;
-} EMailFormatterQuoteAttachmentClass;
-
-static void e_mail_formatter_quote_formatter_extension_interface_init (EMailFormatterExtensionInterface *iface);
-
-G_DEFINE_TYPE_EXTENDED (
+G_DEFINE_TYPE (
 	EMailFormatterQuoteAttachment,
 	e_mail_formatter_quote_attachment,
-	G_TYPE_OBJECT,
-	0,
-	G_IMPLEMENT_INTERFACE (
-		E_TYPE_MAIL_FORMATTER_EXTENSION,
-		e_mail_formatter_quote_formatter_extension_interface_init)
-)
+	E_TYPE_MAIL_FORMATTER_EXTENSION)
 
 static const gchar *formatter_mime_types[] = {
 	"application/vnd.evolution.attachment",
@@ -132,21 +120,15 @@ emfqe_attachment_get_description (EMailFormatterExtension *extension)
 }
 
 static void
-e_mail_formatter_quote_attachment_class_init (EMailFormatterQuoteAttachmentClass *class)
+e_mail_formatter_quote_attachment_class_init (EMailFormatterExtensionClass *class)
 {
+	class->mime_types = formatter_mime_types;
+	class->format = emfqe_attachment_format;
+	class->get_display_name = emfqe_attachment_get_display_name;
+	class->get_description = emfqe_attachment_get_description;
 }
 
 static void
-e_mail_formatter_quote_formatter_extension_interface_init (EMailFormatterExtensionInterface *iface)
+e_mail_formatter_quote_attachment_init (EMailFormatterExtension *extension)
 {
-	iface->mime_types = formatter_mime_types;
-	iface->format = emfqe_attachment_format;
-	iface->get_display_name = emfqe_attachment_get_display_name;
-	iface->get_description = emfqe_attachment_get_description;
-}
-
-static void
-e_mail_formatter_quote_attachment_init (EMailFormatterQuoteAttachment *formatter)
-{
-
 }