From 7885426c2bfc410838e9c49bfd350b04e0535435 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 7 Dec 2012 10:11:00 -0500 Subject: EMailFormatterExtension: Convert get_display_name() to a string field. Of the formatter extensions that provide a display name, they all use a static string. So we don't need an instance of the extension to obtain its display name. Just make it a string field in the class structure. --- modules/vcard-inline/e-mail-formatter-vcard-inline.c | 8 +------- 1 file changed, 1 insertion(+), 7 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 b3e2b830f6..a5240dbc9c 100644 --- a/modules/vcard-inline/e-mail-formatter-vcard-inline.c +++ b/modules/vcard-inline/e-mail-formatter-vcard-inline.c @@ -194,12 +194,6 @@ emfe_vcard_inline_format (EMailFormatterExtension *extension, return TRUE; } -static const gchar * -emfe_vcard_inline_get_display_name (EMailFormatterExtension *extension) -{ - return _("Addressbook Contact"); -} - static const gchar * emfe_vcard_inline_get_description (EMailFormatterExtension *extension) { @@ -209,9 +203,9 @@ emfe_vcard_inline_get_description (EMailFormatterExtension *extension) static void e_mail_formatter_vcard_inline_class_init (EMailFormatterExtensionClass *class) { + class->display_name = _("Addressbook Contact"); 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; } -- cgit v1.2.3