2 files changed, 14 insertions, 18 deletions
diff --git a/modules/vcard-inline/e-mail-formatter-vcard-inline.c b/modules/vcard-inline/e-mail-formatter-vcard-inline.c
index 13e87139ac..7d2abfc626 100644
--- a/modules/vcard-inline/e-mail-formatter-vcard-inline.c
+++ b/modules/vcard-inline/e-mail-formatter-vcard-inline.c
@@ -60,8 +60,12 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (
 		E_TYPE_MAIL_FORMATTER_EXTENSION,
 		e_mail_formatter_formatter_extension_interface_init));
 
-static const gchar * formatter_mime_types[] = { "text/vcard", "text/x-vcard",
-					       "text/directory", NULL };
+static const gchar *formatter_mime_types[] = {
+	"text/vcard",
+	"text/x-vcard",
+	"text/directory",
+	NULL
+};
 
 static gboolean
 emfe_vcard_inline_format (EMailFormatterExtension *extension,
@@ -207,12 +211,6 @@ emfe_vcard_inline_get_description (EMailFormatterExtension *extension)
 	return _("Display the part as an addressbook contact");
 }
 
-static const gchar **
-emfe_vcard_inline_mime_types (EMailExtension *extension)
-{
-	return formatter_mime_types;
-}
-
 static void
 e_mail_formatter_vcard_inline_constructed (GObject *object)
 {
@@ -249,7 +247,7 @@ e_mail_formatter_formatter_extension_interface_init (EMailFormatterExtensionInte
 static void
 e_mail_formatter_mail_extension_interface_init (EMailExtensionInterface *iface)
 {
-	iface->mime_types = emfe_vcard_inline_mime_types;
+	iface->mime_types = formatter_mime_types;
 }
 
 static void
diff --git a/modules/vcard-inline/e-mail-parser-vcard-inline.c b/modules/vcard-inline/e-mail-parser-vcard-inline.c
index 84f4f2f538..0f0014265b 100644
--- a/modules/vcard-inline/e-mail-parser-vcard-inline.c
+++ b/modules/vcard-inline/e-mail-parser-vcard-inline.c
@@ -72,8 +72,12 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (
 		E_TYPE_MAIL_PARSER_EXTENSION,
 		e_mail_parser_parser_extension_interface_init));
 
-static const gchar * parser_mime_types[] = { "text/vcard", "text/x-vcard",
-					    "text/directory", NULL };
+static const gchar *parser_mime_types[] = {
+	"text/vcard",
+	"text/x-vcard",
+	"text/directory",
+	NULL
+};
 
 static void
 mail_part_vcard_inline_free (EMailPart *mail_part)
@@ -376,12 +380,6 @@ empe_vcard_inline_get_flags (EMailParserExtension *extension)
 	return E_MAIL_PARSER_EXTENSION_INLINE_DISPOSITION;
 }
 
-static const gchar **
-empe_mime_types (EMailExtension *extension)
-{
-	return parser_mime_types;
-}
-
 void
 e_mail_parser_vcard_inline_type_register (GTypeModule *type_module)
 {
@@ -391,7 +389,7 @@ e_mail_parser_vcard_inline_type_register (GTypeModule *type_module)
 static void
 e_mail_parser_mail_extension_interface_init (EMailExtensionInterface *iface)
 {
-	iface->mime_types = empe_mime_types;
+	iface->mime_types = parser_mime_types;
 }
 
 static void