From 54455ca1ad6cae527544fed12d0de4ae95341082 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 6 Dec 2012 16:40:13 -0500 Subject: Remove EMailExtension. EMailExtension is now too trivial to keep as a standalone interface. Add a 'mime_types' string array to the EMailFormatterExtension and EMailFormatterParser interface structs. Alter e_mail_extension_registry_add_extension() to take a 'mime_types' string array and the GType of an extension to instantiate, rather than the extension instance directly. e_mail_extension_registry_remove_extension() is no longer needed. --- .../vcard-inline/e-mail-formatter-vcard-inline.c | 79 ++++++++++++---------- modules/vcard-inline/e-mail-parser-vcard-inline.c | 73 +++++++++++--------- 2 files changed, 86 insertions(+), 66 deletions(-) (limited to 'modules/vcard-inline') diff --git a/modules/vcard-inline/e-mail-formatter-vcard-inline.c b/modules/vcard-inline/e-mail-formatter-vcard-inline.c index 7d2abfc626..8c88729455 100644 --- a/modules/vcard-inline/e-mail-formatter-vcard-inline.c +++ b/modules/vcard-inline/e-mail-formatter-vcard-inline.c @@ -36,30 +36,30 @@ #define d(x) -typedef struct _EMailFormatterVCardInline { - EExtension parent; -} EMailFormatterVCardInline; +typedef GObject EMailFormatterVCardInline; +typedef GObjectClass EMailFormatterVCardInlineClass; -typedef struct _EMailFormatterVCardInlineClass { - EExtensionClass parent_class; -} EMailFormatterVCardInlineClass; +typedef EExtension EMailFormatterVCardInlineLoader; +typedef EExtensionClass EMailFormatterVCardInlineLoaderClass; GType e_mail_formatter_vcard_inline_get_type (void); +GType e_mail_formatter_vcard_inline_loader_get_type (void); static void e_mail_formatter_formatter_extension_interface_init (EMailFormatterExtensionInterface *iface); -static void e_mail_formatter_mail_extension_interface_init (EMailExtensionInterface *iface); G_DEFINE_DYNAMIC_TYPE_EXTENDED ( EMailFormatterVCardInline, e_mail_formatter_vcard_inline, - E_TYPE_EXTENSION, + G_TYPE_OBJECT, 0, - G_IMPLEMENT_INTERFACE_DYNAMIC ( - E_TYPE_MAIL_EXTENSION, - e_mail_formatter_mail_extension_interface_init) G_IMPLEMENT_INTERFACE_DYNAMIC ( E_TYPE_MAIL_FORMATTER_EXTENSION, e_mail_formatter_formatter_extension_interface_init)); +G_DEFINE_DYNAMIC_TYPE ( + EMailFormatterVCardInlineLoader, + e_mail_formatter_vcard_inline_loader, + E_TYPE_EXTENSION) + static const gchar *formatter_mime_types[] = { "text/vcard", "text/x-vcard", @@ -212,58 +212,67 @@ emfe_vcard_inline_get_description (EMailFormatterExtension *extension) } static void -e_mail_formatter_vcard_inline_constructed (GObject *object) +e_mail_formatter_vcard_inline_class_init (EMailFormatterVCardInlineClass *class) { - EExtensible *extensible; - EMailExtensionRegistry *reg; - - extensible = e_extension_get_extensible (E_EXTENSION (object)); - reg = E_MAIL_EXTENSION_REGISTRY (extensible); - - e_mail_extension_registry_add_extension (reg, E_MAIL_EXTENSION (object)); } static void -e_mail_formatter_vcard_inline_class_init (EMailFormatterVCardInlineClass *class) +e_mail_formatter_vcard_inline_class_finalize (EMailFormatterVCardInlineClass *class) { - GObjectClass *object_class; - EExtensionClass *extension_class; - - object_class = G_OBJECT_CLASS (class); - object_class->constructed = e_mail_formatter_vcard_inline_constructed; - - extension_class = E_EXTENSION_CLASS (class); - extension_class->extensible_type = E_TYPE_MAIL_FORMATTER_EXTENSION_REGISTRY; } static void e_mail_formatter_formatter_extension_interface_init (EMailFormatterExtensionInterface *iface) { + iface->mime_types = formatter_mime_types; iface->format = emfe_vcard_inline_format; iface->get_display_name = emfe_vcard_inline_get_display_name; iface->get_description = emfe_vcard_inline_get_description; } static void -e_mail_formatter_mail_extension_interface_init (EMailExtensionInterface *iface) +e_mail_formatter_vcard_inline_init (EMailFormatterVCardInline *formatter) { - iface->mime_types = formatter_mime_types; } static void -e_mail_formatter_vcard_inline_init (EMailFormatterVCardInline *formatter) +mail_formatter_vcard_inline_loader_constructed (GObject *object) { + EExtensible *extensible; + + extensible = e_extension_get_extensible (E_EXTENSION (object)); + e_mail_extension_registry_add_extension ( + E_MAIL_EXTENSION_REGISTRY (extensible), + formatter_mime_types, + e_mail_formatter_vcard_inline_get_type ()); } -void -e_mail_formatter_vcard_inline_type_register (GTypeModule *type_module) +static void +e_mail_formatter_vcard_inline_loader_class_init (EExtensionClass *class) { - e_mail_formatter_vcard_inline_register_type (type_module); + GObjectClass *object_class; + + object_class = G_OBJECT_CLASS (class); + object_class->constructed = mail_formatter_vcard_inline_loader_constructed; + + class->extensible_type = E_TYPE_MAIL_FORMATTER_EXTENSION_REGISTRY; } static void -e_mail_formatter_vcard_inline_class_finalize (EMailFormatterVCardInlineClass *class) +e_mail_formatter_vcard_inline_loader_class_finalize (EExtensionClass *class) { +} +static void +e_mail_formatter_vcard_inline_loader_init (EExtension *extension) +{ } + +void +e_mail_formatter_vcard_inline_type_register (GTypeModule *type_module) +{ + e_mail_formatter_vcard_inline_register_type (type_module); + e_mail_formatter_vcard_inline_loader_register_type (type_module); +} + diff --git a/modules/vcard-inline/e-mail-parser-vcard-inline.c b/modules/vcard-inline/e-mail-parser-vcard-inline.c index 0f0014265b..c3998c79f8 100644 --- a/modules/vcard-inline/e-mail-parser-vcard-inline.c +++ b/modules/vcard-inline/e-mail-parser-vcard-inline.c @@ -48,30 +48,30 @@ #define d(x) -typedef struct _EMailParserVCardInline { - EExtension parent; -} EMailParserVCardInline; +typedef GObject EMailParserVCardInline; +typedef GObjectClass EMailParserVCardInlineClass; -typedef struct _EMailParserVCardInlineClass { - EExtensionClass parent_class; -} EMailParserVCardInlineClass; +typedef EExtension EMailParserVCardInlineLoader; +typedef EExtensionClass EMailParserVCardInlineLoaderClass; GType e_mail_parser_vcard_inline_get_type (void); -static void e_mail_parser_mail_extension_interface_init (EMailExtensionInterface *iface); +GType e_mail_parser_vcard_inline_loader_get_type (void); static void e_mail_parser_parser_extension_interface_init (EMailParserExtensionInterface *iface); G_DEFINE_DYNAMIC_TYPE_EXTENDED ( EMailParserVCardInline, e_mail_parser_vcard_inline, - E_TYPE_EXTENSION, + G_TYPE_OBJECT, 0, - G_IMPLEMENT_INTERFACE_DYNAMIC ( - E_TYPE_MAIL_EXTENSION, - e_mail_parser_mail_extension_interface_init) G_IMPLEMENT_INTERFACE_DYNAMIC ( E_TYPE_MAIL_PARSER_EXTENSION, e_mail_parser_parser_extension_interface_init)); +G_DEFINE_DYNAMIC_TYPE ( + EMailParserVCardInlineLoader, + e_mail_parser_vcard_inline_loader, + E_TYPE_EXTENSION) + static const gchar *parser_mime_types[] = { "text/vcard", "text/x-vcard", @@ -380,57 +380,68 @@ empe_vcard_inline_get_flags (EMailParserExtension *extension) return E_MAIL_PARSER_EXTENSION_INLINE_DISPOSITION; } -void -e_mail_parser_vcard_inline_type_register (GTypeModule *type_module) +static void +e_mail_parser_parser_extension_interface_init (EMailParserExtensionInterface *iface) { - e_mail_parser_vcard_inline_register_type (type_module); + iface->mime_types = parser_mime_types; + iface->parse = empe_vcard_inline_parse; + iface->get_flags = empe_vcard_inline_get_flags; } static void -e_mail_parser_mail_extension_interface_init (EMailExtensionInterface *iface) +e_mail_parser_vcard_inline_class_init (EMailParserVCardInlineClass *class) { - iface->mime_types = parser_mime_types; } static void -e_mail_parser_parser_extension_interface_init (EMailParserExtensionInterface *iface) +e_mail_parser_vcard_inline_class_finalize (EMailParserVCardInlineClass *class) { - iface->parse = empe_vcard_inline_parse; - iface->get_flags = empe_vcard_inline_get_flags; + } static void -e_mail_parser_vcard_inline_constructed (GObject *object) +e_mail_parser_vcard_inline_init (EMailParserVCardInline *self) +{ +} + +static void +mail_parser_vcard_inline_loader_constructed (GObject *object) { EExtensible *extensible; - EMailExtensionRegistry *reg; extensible = e_extension_get_extensible (E_EXTENSION (object)); - reg = E_MAIL_EXTENSION_REGISTRY (extensible); - e_mail_extension_registry_add_extension (reg, E_MAIL_EXTENSION (object)); + e_mail_extension_registry_add_extension ( + E_MAIL_EXTENSION_REGISTRY (extensible), + parser_mime_types, + e_mail_parser_vcard_inline_get_type ()); } static void -e_mail_parser_vcard_inline_class_init (EMailParserVCardInlineClass *class) +e_mail_parser_vcard_inline_loader_class_init (EExtensionClass *class) { GObjectClass *object_class; - EExtensionClass *extension_class; object_class = G_OBJECT_CLASS (class); - object_class->constructed = e_mail_parser_vcard_inline_constructed; + object_class->constructed = mail_parser_vcard_inline_loader_constructed; - extension_class = E_EXTENSION_CLASS (class); - extension_class->extensible_type = E_TYPE_MAIL_PARSER_EXTENSION_REGISTRY; + class->extensible_type = E_TYPE_MAIL_PARSER_EXTENSION_REGISTRY; } static void -e_mail_parser_vcard_inline_class_finalize (EMailParserVCardInlineClass *class) +e_mail_parser_vcard_inline_loader_class_finalize (EExtensionClass *class) { - } static void -e_mail_parser_vcard_inline_init (EMailParserVCardInline *self) +e_mail_parser_vcard_inline_loader_init (EExtension *extension) +{ +} + +void +e_mail_parser_vcard_inline_type_register (GTypeModule *type_module) { + e_mail_parser_vcard_inline_register_type (type_module); + e_mail_parser_vcard_inline_loader_register_type (type_module); } + -- cgit v1.2.3