From cab6eac8f14974ea1c2fedaf9143e98cf630c489 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 7 Dec 2012 12:32:32 -0500 Subject: Convert EMailParserExtension to an abstract class. With the previous changes, all parser extensions derive from GObjectClass and implement the EMailParserExtensionInterface. Simplify things further by making EMailParserExtension an abstract base class so parser extensions are now just direct subclasses and need not bother with implementing GObject interfaces. --- em-format/e-mail-parser-inlinepgp-encrypted.c | 33 +++++++-------------------- 1 file changed, 8 insertions(+), 25 deletions(-) (limited to 'em-format/e-mail-parser-inlinepgp-encrypted.c') diff --git a/em-format/e-mail-parser-inlinepgp-encrypted.c b/em-format/e-mail-parser-inlinepgp-encrypted.c index 081ba15dd8..709446c2bb 100644 --- a/em-format/e-mail-parser-inlinepgp-encrypted.c +++ b/em-format/e-mail-parser-inlinepgp-encrypted.c @@ -32,24 +32,13 @@ #include -typedef struct _EMailParserInlinePGPEncrypted { - GObject parent; -} EMailParserInlinePGPEncrypted; +typedef EMailParserExtension EMailParserInlinePGPEncrypted; +typedef EMailParserExtensionClass EMailParserInlinePGPEncryptedClass; -typedef struct _EMailParserInlinePGPEncryptedClass { - GObjectClass parent_class; -} EMailParserInlinePGPEncryptedClass; - -static void e_mail_parser_parser_extension_interface_init (EMailParserExtensionInterface *iface); - -G_DEFINE_TYPE_EXTENDED ( +G_DEFINE_TYPE ( EMailParserInlinePGPEncrypted, e_mail_parser_inline_pgp_encrypted, - G_TYPE_OBJECT, - 0, - G_IMPLEMENT_INTERFACE ( - E_TYPE_MAIL_PARSER_EXTENSION, - e_mail_parser_parser_extension_interface_init)); + E_TYPE_MAIL_PARSER_EXTENSION) static const gchar *parser_mime_types[] = { "application/x-inlinepgp-encrypted", @@ -172,19 +161,13 @@ empe_inlinepgp_encrypted_parse (EMailParserExtension *extension, } static void -e_mail_parser_inline_pgp_encrypted_class_init (EMailParserInlinePGPEncryptedClass *class) +e_mail_parser_inline_pgp_encrypted_class_init (EMailParserExtensionClass *class) { + class->mime_types = parser_mime_types; + class->parse = empe_inlinepgp_encrypted_parse; } static void -e_mail_parser_parser_extension_interface_init (EMailParserExtensionInterface *iface) +e_mail_parser_inline_pgp_encrypted_init (EMailParserExtension *extension) { - iface->mime_types = parser_mime_types; - iface->parse = empe_inlinepgp_encrypted_parse; -} - -static void -e_mail_parser_inline_pgp_encrypted_init (EMailParserInlinePGPEncrypted *parser) -{ - } -- cgit v1.2.3