aboutsummaryrefslogtreecommitdiffstats
path: root/em-format
diff options
context:
space:
mode:
Diffstat (limited to 'em-format')
-rw-r--r--em-format/e-mail-formatter-quote-attachment.c5
-rw-r--r--em-format/e-mail-formatter-quote-headers.c5
-rw-r--r--em-format/e-mail-formatter-quote-message-rfc822.c3
-rw-r--r--em-format/e-mail-formatter-quote-text-enriched.c5
-rw-r--r--em-format/e-mail-formatter-quote-text-html.c3
-rw-r--r--em-format/e-mail-formatter-quote-text-plain.c3
-rw-r--r--em-format/e-mail-formatter-quote.c20
-rw-r--r--em-format/e-mail-formatter-quote.h35
8 files changed, 57 insertions, 22 deletions
diff --git a/em-format/e-mail-formatter-quote-attachment.c b/em-format/e-mail-formatter-quote-attachment.c
index d442236709..6613c27b8d 100644
--- a/em-format/e-mail-formatter-quote-attachment.c
+++ b/em-format/e-mail-formatter-quote-attachment.c
@@ -23,8 +23,7 @@
#include "e-mail-format-extensions.h"
#include "e-mail-part-attachment.h"
-#include <em-format/e-mail-formatter-extension.h>
-#include <em-format/e-mail-formatter.h>
+#include <em-format/e-mail-formatter-quote.h>
#include <em-format/e-mail-part-utils.h>
#include <e-util/e-util.h>
@@ -39,7 +38,7 @@ typedef EMailFormatterExtensionClass EMailFormatterQuoteAttachmentClass;
G_DEFINE_TYPE (
EMailFormatterQuoteAttachment,
e_mail_formatter_quote_attachment,
- E_TYPE_MAIL_FORMATTER_EXTENSION)
+ E_TYPE_MAIL_FORMATTER_QUOTE_EXTENSION)
static const gchar *formatter_mime_types[] = {
"application/vnd.evolution.attachment",
diff --git a/em-format/e-mail-formatter-quote-headers.c b/em-format/e-mail-formatter-quote-headers.c
index b98f17940d..a97c5b1964 100644
--- a/em-format/e-mail-formatter-quote-headers.c
+++ b/em-format/e-mail-formatter-quote-headers.c
@@ -24,8 +24,7 @@
#include <glib/gi18n-lib.h>
-#include <em-format/e-mail-formatter-extension.h>
-#include <em-format/e-mail-formatter.h>
+#include <em-format/e-mail-formatter-quote.h>
#include <em-format/e-mail-formatter-utils.h>
#include <em-format/e-mail-inline-filter.h>
#include <libemail-engine/e-mail-utils.h>
@@ -41,7 +40,7 @@ typedef EMailFormatterExtensionClass EMailFormatterQuoteHeadersClass;
G_DEFINE_TYPE (
EMailFormatterQuoteHeaders,
e_mail_formatter_quote_headers,
- E_TYPE_MAIL_FORMATTER_EXTENSION)
+ E_TYPE_MAIL_FORMATTER_QUOTE_EXTENSION)
static const gchar *formatter_mime_types[] = {
"application/vnd.evolution.headers",
diff --git a/em-format/e-mail-formatter-quote-message-rfc822.c b/em-format/e-mail-formatter-quote-message-rfc822.c
index d235788b3e..cb33fc1c01 100644
--- a/em-format/e-mail-formatter-quote-message-rfc822.c
+++ b/em-format/e-mail-formatter-quote-message-rfc822.c
@@ -25,7 +25,6 @@
#include <glib/gi18n-lib.h>
#include <glib-object.h>
-#include <em-format/e-mail-formatter-extension.h>
#include <em-format/e-mail-formatter-quote.h>
#include <em-format/e-mail-part-list.h>
#include <em-format/e-mail-part-utils.h>
@@ -41,7 +40,7 @@ typedef EMailFormatterExtensionClass EMailFormatterQuoteMessageRFC822Class;
G_DEFINE_TYPE (
EMailFormatterQuoteMessageRFC822,
e_mail_formatter_quote_message_rfc822,
- E_TYPE_MAIL_FORMATTER_EXTENSION)
+ E_TYPE_MAIL_FORMATTER_QUOTE_EXTENSION)
static const gchar *formatter_mime_types[] = {
"message/rfc822",
diff --git a/em-format/e-mail-formatter-quote-text-enriched.c b/em-format/e-mail-formatter-quote-text-enriched.c
index 05ae6e0452..82f6dc06e5 100644
--- a/em-format/e-mail-formatter-quote-text-enriched.c
+++ b/em-format/e-mail-formatter-quote-text-enriched.c
@@ -22,8 +22,7 @@
#include "e-mail-format-extensions.h"
-#include <em-format/e-mail-formatter-extension.h>
-#include <em-format/e-mail-formatter.h>
+#include <em-format/e-mail-formatter-quote.h>
#include <em-format/e-mail-inline-filter.h>
#include <e-util/e-util.h>
@@ -36,7 +35,7 @@ typedef EMailFormatterExtensionClass EMailFormatterQuoteTextEnrichedClass;
G_DEFINE_TYPE (
EMailFormatterQuoteTextEnriched,
e_mail_formatter_quote_text_enriched,
- E_TYPE_MAIL_FORMATTER_EXTENSION)
+ E_TYPE_MAIL_FORMATTER_QUOTE_EXTENSION)
static const gchar *formatter_mime_types[] = {
"text/enriched",
diff --git a/em-format/e-mail-formatter-quote-text-html.c b/em-format/e-mail-formatter-quote-text-html.c
index dc98d99574..ac414ea939 100644
--- a/em-format/e-mail-formatter-quote-text-html.c
+++ b/em-format/e-mail-formatter-quote-text-html.c
@@ -22,7 +22,6 @@
#include "e-mail-format-extensions.h"
-#include <em-format/e-mail-formatter-extension.h>
#include <em-format/e-mail-formatter-quote.h>
#include <em-format/e-mail-stripsig-filter.h>
#include <em-format/e-mail-part-utils.h>
@@ -39,7 +38,7 @@ typedef EMailFormatterExtensionClass EMailFormatterQuoteTextHTMLClass;
G_DEFINE_TYPE (
EMailFormatterQuoteTextHTML,
e_mail_formatter_quote_text_html,
- E_TYPE_MAIL_FORMATTER_EXTENSION)
+ E_TYPE_MAIL_FORMATTER_QUOTE_EXTENSION)
static const gchar *formatter_mime_types[] = {
"text/html",
diff --git a/em-format/e-mail-formatter-quote-text-plain.c b/em-format/e-mail-formatter-quote-text-plain.c
index 8c7e369814..b3525e72d5 100644
--- a/em-format/e-mail-formatter-quote-text-plain.c
+++ b/em-format/e-mail-formatter-quote-text-plain.c
@@ -22,7 +22,6 @@
#include "e-mail-format-extensions.h"
-#include <em-format/e-mail-formatter-extension.h>
#include <em-format/e-mail-formatter-quote.h>
#include <em-format/e-mail-part-utils.h>
#include <em-format/e-mail-stripsig-filter.h>
@@ -37,7 +36,7 @@ typedef EMailFormatterExtensionClass EMailFormatterQuoteTextPlainClass;
G_DEFINE_TYPE (
EMailFormatterQuoteTextPlain,
e_mail_formatter_quote_text_plain,
- E_TYPE_MAIL_FORMATTER_EXTENSION)
+ E_TYPE_MAIL_FORMATTER_QUOTE_EXTENSION)
static const gchar *formatter_mime_types[] = {
"text/plain",
diff --git a/em-format/e-mail-formatter-quote.c b/em-format/e-mail-formatter-quote.c
index f6ff5e35aa..a8833eef9d 100644
--- a/em-format/e-mail-formatter-quote.c
+++ b/em-format/e-mail-formatter-quote.c
@@ -20,7 +20,7 @@
#include <camel/camel.h>
-#include "e-mail-formatter-extension.h"
+#include "e-mail-formatter-quote.h"
#include "e-mail-part.h"
#include "e-mail-part-attachment.h"
#include "e-mail-part-utils.h"
@@ -236,3 +236,21 @@ e_mail_formatter_quote_new (const gchar *credits,
return (EMailFormatter *) formatter;
}
+
+/* ------------------------------------------------------------------------- */
+
+G_DEFINE_ABSTRACT_TYPE (
+ EMailFormatterQuoteExtension,
+ e_mail_formatter_quote_extension,
+ E_TYPE_MAIL_FORMATTER_EXTENSION)
+
+static void
+e_mail_formatter_quote_extension_class_init (EMailFormatterQuoteExtensionClass *class)
+{
+}
+
+static void
+e_mail_formatter_quote_extension_init (EMailFormatterQuoteExtension *extension)
+{
+}
+
diff --git a/em-format/e-mail-formatter-quote.h b/em-format/e-mail-formatter-quote.h
index fa6730b964..380f94a806 100644
--- a/em-format/e-mail-formatter-quote.h
+++ b/em-format/e-mail-formatter-quote.h
@@ -16,10 +16,11 @@
*
*/
-#ifndef E_MAIL_FORMATTER_QUOTE_H_
-#define E_MAIL_FORMATTER_QUOTE_H_
+#ifndef E_MAIL_FORMATTER_QUOTE_H
+#define E_MAIL_FORMATTER_QUOTE_H
#include <em-format/e-mail-formatter.h>
+#include <em-format/e-mail-formatter-extension.h>
/* Standard GObject macros */
#define E_TYPE_MAIL_FORMATTER_QUOTE \
@@ -69,11 +70,33 @@ struct _EMailFormatterQuoteClass {
EMailFormatterClass parent_class;
};
-GType e_mail_formatter_quote_get_type (void);
-
-EMailFormatter * e_mail_formatter_quote_new (const gchar *credits,
+GType e_mail_formatter_quote_get_type (void) G_GNUC_CONST;
+EMailFormatter *
+ e_mail_formatter_quote_new (const gchar *credits,
EMailFormatterQuoteFlags flags);
G_END_DECLS
-#endif /* E_MAIL_FORMATTER_QUOTE_H_ */
+/* ------------------------------------------------------------------------- */
+
+/* Standard GObject macros */
+#define E_TYPE_MAIL_FORMATTER_QUOTE_EXTENSION \
+ (e_mail_formatter_quote_extension_get_type ())
+
+G_BEGIN_DECLS
+
+/**
+ * EMailFormatterQuoteExtension:
+ *
+ * This is an abstract base type for formatter extensions which are
+ * intended only for use by #EMailFormatterQuote.
+ **/
+typedef EMailFormatterExtension EMailFormatterQuoteExtension;
+typedef EMailFormatterExtensionClass EMailFormatterQuoteExtensionClass;
+
+GType e_mail_formatter_quote_extension_get_type
+ (void) G_GNUC_CONST;
+
+G_END_DECLS
+
+#endif /* E_MAIL_FORMATTER_QUOTE_H */