EMailFormatterExtension: Convert get_description() to a string field.

Of the formatter extensions that provide a description, they all use a
static string.  So we don't need an instance of the extension to obtain
its description.  Just make it a string field in the class structure.

4 files changed, 4 insertions, 28 deletions

diff --git a/modules/audio-inline/e-mail-formatter-audio-inline.c b/modules/audio-inline/e-mail-formatter-audio-inline.c
index ed5630796e..4520e377b6 100644
--- a/modules/audio-inline/e-mail-formatter-audio-inline.c
+++ b/modules/audio-inline/e-mail-formatter-audio-inline.c
@@ -311,20 +311,14 @@ emfe_audio_inline_get_widget (EMailFormatterExtension *extension,
 	return box;
 }
 
-static const gchar *
-emfe_audio_inline_get_description (EMailFormatterExtension *extension)
-{
-	return _("Play the attachment in embedded audio player");
-}
-
 static void
 e_mail_formatter_audio_inline_class_init (EMailFormatterExtensionClass *class)
 {
 	class->display_name = _("Audio Player");
+	class->description = _("Play the attachment in embedded audio player");
 	class->mime_types = formatter_mime_types;
 	class->format = emfe_audio_inline_format;
 	class->get_widget = emfe_audio_inline_get_widget;
-	class->get_description = emfe_audio_inline_get_description;
 }
 
 static void
diff --git a/modules/itip-formatter/e-mail-formatter-itip.c b/modules/itip-formatter/e-mail-formatter-itip.c
index 03101fb746..86132f4f7b 100644
--- a/modules/itip-formatter/e-mail-formatter-itip.c
+++ b/modules/itip-formatter/e-mail-formatter-itip.c
@@ -136,19 +136,13 @@ emfe_itip_format (EMailFormatterExtension *extension,
 	return TRUE;
 }
 
-static const gchar *
-emfe_itip_get_description (EMailFormatterExtension *extension)
-{
-	return _("Display part as an invitation");
-}
-
 static void
 e_mail_formatter_itip_class_init (EMailFormatterExtensionClass *class)
 {
 	class->display_name = _("ITIP");
+	class->description = _("Display part as an invitation");
 	class->mime_types = formatter_mime_types;
 	class->format = emfe_itip_format;
-	class->get_description = emfe_itip_get_description;
 }
 
 static void
diff --git a/modules/text-highlight/e-mail-formatter-text-highlight.c b/modules/text-highlight/e-mail-formatter-text-highlight.c
index 8d44135cbc..fc5ca1d482 100644
--- a/modules/text-highlight/e-mail-formatter-text-highlight.c
+++ b/modules/text-highlight/e-mail-formatter-text-highlight.c
@@ -356,19 +356,13 @@ emfe_text_highlight_format (EMailFormatterExtension *extension,
 	return TRUE;
 }
 
-static const gchar *
-emfe_text_highlight_get_description (EMailFormatterExtension *extension)
-{
-	return _("Syntax highlighting of mail parts");
-}
-
 static void
 e_mail_formatter_text_highlight_class_init (EMailFormatterExtensionClass *class)
 {
 	class->display_name = _("Text Highlight");
+	class->description = _("Syntax highlighting of mail parts");
 	class->mime_types = get_mime_types ();
 	class->format = emfe_text_highlight_format;
-	class->get_description = emfe_text_highlight_get_description;
 }
 
 static void
diff --git a/modules/vcard-inline/e-mail-formatter-vcard-inline.c b/modules/vcard-inline/e-mail-formatter-vcard-inline.c
index a5240dbc9c..873d9c7343 100644
--- a/modules/vcard-inline/e-mail-formatter-vcard-inline.c
+++ b/modules/vcard-inline/e-mail-formatter-vcard-inline.c
@@ -194,19 +194,13 @@ emfe_vcard_inline_format (EMailFormatterExtension *extension,
 	return TRUE;
 }
 
-static const gchar *
-emfe_vcard_inline_get_description (EMailFormatterExtension *extension)
-{
-	return _("Display the part as an addressbook contact");
-}
-
 static void
 e_mail_formatter_vcard_inline_class_init (EMailFormatterExtensionClass *class)
 {
 	class->display_name = _("Addressbook Contact");
+	class->description = _("Display the part as an addressbook contact");
 	class->mime_types = formatter_mime_types;
 	class->format = emfe_vcard_inline_format;
-	class->get_description = emfe_vcard_inline_get_description;
 }
 
 static void