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, 11 insertions, 28 deletions

diff --git a/em-format/e-mail-formatter-attachment-bar.c b/em-format/e-mail-formatter-attachment-bar.c
index 160c8af891..57e6a72d8f 100644
--- a/em-format/e-mail-formatter-attachment-bar.c
+++ b/em-format/e-mail-formatter-attachment-bar.c
@@ -28,24 +28,13 @@
 #include <em-format/e-mail-formatter-extension.h>
 #include <em-format/e-mail-formatter.h>
 
-typedef struct _EMailFormatterAttachmentBar {
-	GObject parent;
-} EMailFormatterAttachmentBar;
+typedef EMailFormatterExtension EMailFormatterAttachmentBar;
+typedef EMailFormatterExtensionClass EMailFormatterAttachmentBarClass;
 
-typedef struct _EMailFormatterAttachmentBarClass {
-	GObjectClass parent_class;
-} EMailFormatterAttachmentBarClass;
-
-static void e_mail_formatter_formatter_extension_interface_init (EMailFormatterExtensionInterface *iface);
-
-G_DEFINE_TYPE_EXTENDED (
+G_DEFINE_TYPE (
 	EMailFormatterAttachmentBar,
 	e_mail_formatter_attachment_bar,
-	G_TYPE_OBJECT,
-	0,
-	G_IMPLEMENT_INTERFACE (
-		E_TYPE_MAIL_FORMATTER_EXTENSION,
-		e_mail_formatter_formatter_extension_interface_init));
+	E_TYPE_MAIL_FORMATTER_EXTENSION)
 
 static const gchar *formatter_mime_types[] = {
 	"application/vnd.evolution.widget.attachment-bar",
@@ -122,22 +111,16 @@ emfe_attachment_bar_get_description (EMailFormatterExtension *extension)
 }
 
 static void
-e_mail_formatter_attachment_bar_class_init (EMailFormatterAttachmentBarClass *class)
+e_mail_formatter_attachment_bar_class_init (EMailFormatterExtensionClass *class)
 {
+	class->mime_types = formatter_mime_types;
+	class->format = emfe_attachment_bar_format;
+	class->get_widget = emfe_attachment_bar_get_widget;
+	class->get_display_name = emfe_attachment_bar_get_display_name;
+	class->get_description = emfe_attachment_bar_get_description;
 }
 
 static void
-e_mail_formatter_formatter_extension_interface_init (EMailFormatterExtensionInterface *iface)
+e_mail_formatter_attachment_bar_init (EMailFormatterExtension *extension)
 {
-	iface->mime_types = formatter_mime_types;
-	iface->format = emfe_attachment_bar_format;
-	iface->get_widget = emfe_attachment_bar_get_widget;
-	iface->get_display_name = emfe_attachment_bar_get_display_name;
-	iface->get_description = emfe_attachment_bar_get_description;
-}
-
-static void
-e_mail_formatter_attachment_bar_init (EMailFormatterAttachmentBar *extension)
-{
-
 }