diff options
Diffstat (limited to 'modules')
4 files changed, 45 insertions, 85 deletions
diff --git a/modules/audio-inline/e-mail-formatter-audio-inline.c b/modules/audio-inline/e-mail-formatter-audio-inline.c index 461a3ab739..f93bf67f4f 100644 --- a/modules/audio-inline/e-mail-formatter-audio-inline.c +++ b/modules/audio-inline/e-mail-formatter-audio-inline.c @@ -38,24 +38,19 @@ #define d(x) -typedef GObject EMailFormatterAudioInline; -typedef GObjectClass EMailFormatterAudioInlineClass; +typedef EMailFormatterExtension EMailFormatterAudioInline; +typedef EMailFormatterExtensionClass EMailFormatterAudioInlineClass; typedef EExtension EMailFormatterAudioInlineLoader; typedef EExtensionClass EMailFormatterAudioInlineLoaderClass; GType e_mail_formatter_audio_inline_get_type (void); GType e_mail_formatter_audio_inline_loader_get_type (void); -static void e_mail_formatter_formatter_extension_interface_init (EMailFormatterExtensionInterface *iface); -G_DEFINE_DYNAMIC_TYPE_EXTENDED ( +G_DEFINE_DYNAMIC_TYPE ( EMailFormatterAudioInline, e_mail_formatter_audio_inline, - G_TYPE_OBJECT, - 0, - G_IMPLEMENT_INTERFACE_DYNAMIC ( - E_TYPE_MAIL_FORMATTER_EXTENSION, - e_mail_formatter_formatter_extension_interface_init)); + E_TYPE_MAIL_FORMATTER_EXTENSION) G_DEFINE_DYNAMIC_TYPE ( EMailFormatterAudioInlineLoader, @@ -329,27 +324,22 @@ emfe_audio_inline_get_description (EMailFormatterExtension *extension) } static void -e_mail_formatter_audio_inline_class_init (EMailFormatterAudioInlineClass *class) -{ -} - -static void -e_mail_formatter_formatter_extension_interface_init (EMailFormatterExtensionInterface *iface) +e_mail_formatter_audio_inline_class_init (EMailFormatterExtensionClass *class) { - iface->mime_types = formatter_mime_types; - iface->format = emfe_audio_inline_format; - iface->get_widget = emfe_audio_inline_get_widget; - iface->get_display_name = emfe_audio_inline_get_display_name; - iface->get_description = emfe_audio_inline_get_description; + class->mime_types = formatter_mime_types; + class->format = emfe_audio_inline_format; + class->get_widget = emfe_audio_inline_get_widget; + class->get_display_name = emfe_audio_inline_get_display_name; + class->get_description = emfe_audio_inline_get_description; } static void -e_mail_formatter_audio_inline_init (EMailFormatterAudioInline *formatter) +e_mail_formatter_audio_inline_class_finalize (EMailFormatterExtensionClass *class) { } static void -e_mail_formatter_audio_inline_class_finalize (EMailFormatterAudioInlineClass *class) +e_mail_formatter_audio_inline_init (EMailFormatterExtension *extension) { } diff --git a/modules/itip-formatter/e-mail-formatter-itip.c b/modules/itip-formatter/e-mail-formatter-itip.c index 2aab01288b..41bf368227 100644 --- a/modules/itip-formatter/e-mail-formatter-itip.c +++ b/modules/itip-formatter/e-mail-formatter-itip.c @@ -34,24 +34,19 @@ #define d(x) -typedef GObject EMailFormatterItip; -typedef GObjectClass EMailFormatterItipClass; +typedef EMailFormatterExtension EMailFormatterItip; +typedef EMailFormatterExtensionClass EMailFormatterItipClass; typedef EExtension EMailFormatterItipLoader; typedef EExtensionClass EMailFormatterItipLoaderClass; GType e_mail_formatter_itip_get_type (void); GType e_mail_formatter_itip_loader_get_type (void); -static void e_mail_formatter_formatter_extension_interface_init (EMailFormatterExtensionInterface *iface); -G_DEFINE_DYNAMIC_TYPE_EXTENDED ( +G_DEFINE_DYNAMIC_TYPE ( EMailFormatterItip, e_mail_formatter_itip, - G_TYPE_OBJECT, - 0, - G_IMPLEMENT_INTERFACE_DYNAMIC ( - E_TYPE_MAIL_FORMATTER_EXTENSION, - e_mail_formatter_formatter_extension_interface_init)); + E_TYPE_MAIL_FORMATTER_EXTENSION) G_DEFINE_DYNAMIC_TYPE ( EMailFormatterItipLoader, @@ -154,26 +149,21 @@ emfe_itip_get_description (EMailFormatterExtension *extension) } static void -e_mail_formatter_itip_class_init (EMailFormatterItipClass *class) -{ -} - -static void -e_mail_formatter_itip_class_finalize (EMailFormatterItipClass *class) +e_mail_formatter_itip_class_init (EMailFormatterExtensionClass *class) { + class->mime_types = formatter_mime_types; + class->format = emfe_itip_format; + class->get_display_name = emfe_itip_get_display_name; + class->get_description = emfe_itip_get_description; } static void -e_mail_formatter_formatter_extension_interface_init (EMailFormatterExtensionInterface *iface) +e_mail_formatter_itip_class_finalize (EMailFormatterExtensionClass *class) { - iface->mime_types = formatter_mime_types; - iface->format = emfe_itip_format; - iface->get_display_name = emfe_itip_get_display_name; - iface->get_description = emfe_itip_get_description; } static void -e_mail_formatter_itip_init (EMailFormatterItip *formatter) +e_mail_formatter_itip_init (EMailFormatterExtension *extension) { } diff --git a/modules/text-highlight/e-mail-formatter-text-highlight.c b/modules/text-highlight/e-mail-formatter-text-highlight.c index 4655d3182d..f927eaf3a9 100644 --- a/modules/text-highlight/e-mail-formatter-text-highlight.c +++ b/modules/text-highlight/e-mail-formatter-text-highlight.c @@ -38,24 +38,19 @@ #include <X11/Xlib.h> #include <camel/camel.h> -typedef GObject EMailFormatterTextHighlight; -typedef GObjectClass EMailFormatterTextHighlightClass; +typedef EMailFormatterExtension EMailFormatterTextHighlight; +typedef EMailFormatterExtensionClass EMailFormatterTextHighlightClass; typedef EExtension EMailFormatterTextHighlightLoader; typedef EExtensionClass EMailFormatterTextHighlightLoaderClass; GType e_mail_formatter_text_highlight_get_type (void); GType e_mail_formatter_text_highlight_loader_get_type (void); -static void e_mail_formatter_formatter_extension_interface_init (EMailFormatterExtensionInterface *iface); -G_DEFINE_DYNAMIC_TYPE_EXTENDED ( +G_DEFINE_DYNAMIC_TYPE ( EMailFormatterTextHighlight, e_mail_formatter_text_highlight, - G_TYPE_OBJECT, - 0, - G_IMPLEMENT_INTERFACE_DYNAMIC ( - E_TYPE_MAIL_FORMATTER_EXTENSION, - e_mail_formatter_formatter_extension_interface_init)); + E_TYPE_MAIL_FORMATTER_EXTENSION) G_DEFINE_DYNAMIC_TYPE ( EMailFormatterTextHighlightLoader, @@ -374,26 +369,21 @@ emfe_text_highlight_get_description (EMailFormatterExtension *extension) } static void -e_mail_formatter_text_highlight_class_init (EMailFormatterTextHighlightClass *class) -{ -} - -static void -e_mail_formatter_text_highlight_class_finalize (EMailFormatterTextHighlightClass *class) +e_mail_formatter_text_highlight_class_init (EMailFormatterExtensionClass *class) { + class->mime_types = get_mime_types (); + class->format = emfe_text_highlight_format; + class->get_display_name = emfe_text_highlight_get_display_name; + class->get_description = emfe_text_highlight_get_description; } static void -e_mail_formatter_formatter_extension_interface_init (EMailFormatterExtensionInterface *iface) +e_mail_formatter_text_highlight_class_finalize (EMailFormatterExtensionClass *class) { - iface->mime_types = get_mime_types (); - iface->format = emfe_text_highlight_format; - iface->get_display_name = emfe_text_highlight_get_display_name; - iface->get_description = emfe_text_highlight_get_description; } static void -e_mail_formatter_text_highlight_init (EMailFormatterTextHighlight *object) +e_mail_formatter_text_highlight_init (EMailFormatterExtension *extension) { } diff --git a/modules/vcard-inline/e-mail-formatter-vcard-inline.c b/modules/vcard-inline/e-mail-formatter-vcard-inline.c index 8c88729455..b3e2b830f6 100644 --- a/modules/vcard-inline/e-mail-formatter-vcard-inline.c +++ b/modules/vcard-inline/e-mail-formatter-vcard-inline.c @@ -36,24 +36,19 @@ #define d(x) -typedef GObject EMailFormatterVCardInline; -typedef GObjectClass EMailFormatterVCardInlineClass; +typedef EMailFormatterExtension EMailFormatterVCardInline; +typedef EMailFormatterExtensionClass 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); -G_DEFINE_DYNAMIC_TYPE_EXTENDED ( +G_DEFINE_DYNAMIC_TYPE ( EMailFormatterVCardInline, e_mail_formatter_vcard_inline, - G_TYPE_OBJECT, - 0, - G_IMPLEMENT_INTERFACE_DYNAMIC ( - E_TYPE_MAIL_FORMATTER_EXTENSION, - e_mail_formatter_formatter_extension_interface_init)); + E_TYPE_MAIL_FORMATTER_EXTENSION) G_DEFINE_DYNAMIC_TYPE ( EMailFormatterVCardInlineLoader, @@ -212,26 +207,21 @@ emfe_vcard_inline_get_description (EMailFormatterExtension *extension) } static void -e_mail_formatter_vcard_inline_class_init (EMailFormatterVCardInlineClass *class) -{ -} - -static void -e_mail_formatter_vcard_inline_class_finalize (EMailFormatterVCardInlineClass *class) +e_mail_formatter_vcard_inline_class_init (EMailFormatterExtensionClass *class) { + class->mime_types = formatter_mime_types; + class->format = emfe_vcard_inline_format; + class->get_display_name = emfe_vcard_inline_get_display_name; + class->get_description = emfe_vcard_inline_get_description; } static void -e_mail_formatter_formatter_extension_interface_init (EMailFormatterExtensionInterface *iface) +e_mail_formatter_vcard_inline_class_finalize (EMailFormatterExtensionClass *class) { - 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_vcard_inline_init (EMailFormatterVCardInline *formatter) +e_mail_formatter_vcard_inline_init (EMailFormatterExtension *extension) { } |