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, 14 insertions, 31 deletions

diff --git a/em-format/e-mail-formatter-text-html.c b/em-format/e-mail-formatter-text-html.c
index 08c40127d0..9a1883eb5c 100644
--- a/em-format/e-mail-formatter-text-html.c
+++ b/em-format/e-mail-formatter-text-html.c
@@ -34,30 +34,19 @@
 #include <ctype.h>
 #include <string.h>
 
+typedef EMailFormatterExtension EMailFormatterTextHTML;
+typedef EMailFormatterExtensionClass EMailFormatterTextHTMLClass;
+
+G_DEFINE_TYPE (
+	EMailFormatterTextHTML,
+	e_mail_formatter_text_html,
+	E_TYPE_MAIL_FORMATTER_EXTENSION)
+
 static const gchar *formatter_mime_types[] = {
 	"text/html",
 	NULL
 };
 
-typedef struct _EMailFormatterTextHTML {
-	GObject parent;
-} EMailFormatterTextHTML;
-
-typedef struct _EMailFormatterTextHTMLClass {
-	GObjectClass parent_class;
-} EMailFormatterTextHTMLClass;
-
-static void e_mail_formatter_formatter_extension_interface_init (EMailFormatterExtensionInterface *iface);
-
-G_DEFINE_TYPE_EXTENDED (
-	EMailFormatterTextHTML,
-	e_mail_formatter_text_html,
-	G_TYPE_OBJECT,
-	0,
-	G_IMPLEMENT_INTERFACE (
-		E_TYPE_MAIL_FORMATTER_EXTENSION,
-		e_mail_formatter_formatter_extension_interface_init));
-
 static gchar *
 get_tag (const gchar *utf8_string,
          const gchar *tag_name,
@@ -360,21 +349,15 @@ emfe_text_html_get_description (EMailFormatterExtension *extension)
 }
 
 static void
-e_mail_formatter_text_html_class_init (EMailFormatterTextHTMLClass *class)
+e_mail_formatter_text_html_class_init (EMailFormatterExtensionClass *class)
 {
+	class->mime_types = formatter_mime_types;
+	class->format = emfe_text_html_format;
+	class->get_display_name = emfe_text_html_get_display_name;
+	class->get_description = emfe_text_html_get_description;
 }
 
 static void
-e_mail_formatter_formatter_extension_interface_init (EMailFormatterExtensionInterface *iface)
+e_mail_formatter_text_html_init (EMailFormatterExtension *extension)
 {
-	iface->mime_types = formatter_mime_types;
-	iface->format = emfe_text_html_format;
-	iface->get_display_name = emfe_text_html_get_display_name;
-	iface->get_description = emfe_text_html_get_description;
-}
-
-static void
-e_mail_formatter_text_html_init (EMailFormatterTextHTML *formatter)
-{
-
 }