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-application-smime.c | 45 +++++++++-------------------- 1 file changed, 14 insertions(+), 31 deletions(-) (limited to 'em-format/e-mail-parser-application-smime.c') diff --git a/em-format/e-mail-parser-application-smime.c b/em-format/e-mail-parser-application-smime.c index e5eab1bc4d..29e623b52c 100644 --- a/em-format/e-mail-parser-application-smime.c +++ b/em-format/e-mail-parser-application-smime.c @@ -34,24 +34,13 @@ #include -typedef struct _EMailParserApplicationSMIME { - GObject parent; -} EMailParserApplicationSMIME; +typedef EMailParserExtension EMailParserApplicationSMIME; +typedef EMailParserExtensionClass EMailParserApplicationSMIMEClass; -typedef struct _EMailParserAppplicationSMIMEClass { - GObjectClass parent_class; -} EMailParserApplicationSMIMEClass; - -static void e_mail_parser_parser_extension_interface_init (EMailParserExtensionInterface *iface); - -G_DEFINE_TYPE_EXTENDED ( +G_DEFINE_TYPE ( EMailParserApplicationSMIME, e_mail_parser_application_smime, - 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/xpkcs7mime", @@ -65,11 +54,11 @@ static const gchar *parser_mime_types[] = { static gboolean empe_app_smime_parse (EMailParserExtension *extension, - EMailParser *parser, - CamelMimePart *part, - GString *part_id, - GCancellable *cancellable, - GQueue *out_mail_parts) + EMailParser *parser, + CamelMimePart *part, + GString *part_id, + GCancellable *cancellable, + GQueue *out_mail_parts) { CamelCipherContext *context; CamelMimePart *opart; @@ -168,20 +157,14 @@ empe_app_smime_get_flags (EMailParserExtension *extension) } static void -e_mail_parser_application_smime_class_init (EMailParserApplicationSMIMEClass *class) +e_mail_parser_application_smime_class_init (EMailParserExtensionClass *class) { + class->mime_types = parser_mime_types; + class->parse = empe_app_smime_parse; + class->get_flags = empe_app_smime_get_flags; } static void -e_mail_parser_parser_extension_interface_init (EMailParserExtensionInterface *interface) +e_mail_parser_application_smime_init (EMailParserExtension *extension) { - interface->mime_types = parser_mime_types; - interface->parse = empe_app_smime_parse; - interface->get_flags = empe_app_smime_get_flags; -} - -static void -e_mail_parser_application_smime_init (EMailParserApplicationSMIME *parser) -{ - } -- cgit