Rename libemformat to libevolution-mail-formatter.

To make Evolution's shared libraries more consistent.

Also add an evolution-mail-formatter documentation module.

8 files changed, 16 insertions, 19 deletions

diff --git a/em-format/Makefile.am b/em-format/Makefile.am
index 45e96fd0f4..5124c39e7a 100644
--- a/em-format/Makefile.am
+++ b/em-format/Makefile.am
@@ -1,8 +1,8 @@
-emformatincludedir = $(privincludedir)/em-format
+evolution_mail_formatter_includedir = $(privincludedir)/em-format
 
-privsolib_LTLIBRARIES = libemformat.la
+privsolib_LTLIBRARIES = libevolution-mail-formatter.la
 
-emformatinclude_HEADERS =				\
+evolution_mail_formatter_include_HEADERS =		\
 	e-mail-extension-registry.h			\
 	e-mail-formatter-extension.h			\
 	e-mail-formatter.h				\
@@ -21,7 +21,7 @@ emformatinclude_HEADERS =				\
 	e-mail-part-utils.h				\
 	e-mail-stripsig-filter.h
 
-libemformat_la_CPPFLAGS =				\
+libevolution_mail_formatter_la_CPPFLAGS =		\
 	$(AM_CPPFLAGS)					\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/em-format			\
@@ -38,8 +38,8 @@ if ENABLE_SMIME
 SMIME_EXTENSIONS = e-mail-parser-application-smime.c
 endif
 
-libemformat_la_SOURCES =				\
-	$(emformatinclude_HEADERS)			\
+libevolution_mail_formatter_la_SOURCES =		\
+	$(evolution_mail_formatter_include_HEADERS)	\
 	e-mail-extension-registry.c			\
 	e-mail-inline-filter.c				\
 	e-mail-formatter.c				\
@@ -99,7 +99,7 @@ libemformat_la_SOURCES =				\
 	e-mail-stripsig-filter.c			\
 	$(SMIME_EXTENSIONS)
 
-libemformat_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
+libevolution_mail_formatter_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
 
 if ENABLE_SMIME
@@ -108,7 +108,7 @@ SMIME_LIBS =						\
 	$(top_builddir)/smime/gui/libevolution-smime.la
 endif
 
-libemformat_la_LIBADD =					\
+libevolution_mail_formatter_la_LIBADD =			\
 	$(top_builddir)/e-util/libevolution-util.la	\
 	$(top_builddir)/shell/libevolution-shell.la	\
 	$(top_builddir)/libemail-engine/libemail-engine.la \
diff --git a/em-format/e-mail-extension-registry.c b/em-format/e-mail-extension-registry.c
index 3d5e7baa7c..d5beb2f64b 100644
--- a/em-format/e-mail-extension-registry.c
+++ b/em-format/e-mail-extension-registry.c
@@ -142,7 +142,7 @@ e_mail_extension_registry_init (EMailExtensionRegistry *registry)
 
 /**
  * e_mail_extension_registry_get_for_mime_type:
- * @regstry: An #EMailExtensionRegistry
+ * @registry: An #EMailExtensionRegistry
  * @mime_type: A string with mime-type to look up
  *
  * Tries to lookup list of #EMailExtension<!-//>s that has registryed themselves
diff --git a/em-format/e-mail-formatter-print.h b/em-format/e-mail-formatter-print.h
index ca67a13137..a6a2ce2383 100644
--- a/em-format/e-mail-formatter-print.h
+++ b/em-format/e-mail-formatter-print.h
@@ -45,7 +45,6 @@ G_BEGIN_DECLS;
 
 typedef struct _EMailFormatterPrint EMailFormatterPrint;
 typedef struct _EMailFormatterPrintClass EMailFormatterPrintClass;
-typedef struct _EMailFormatterPrintContext EMailFormatterPrintContext;
 
 struct _EMailFormatterPrint {
 	EMailFormatter parent;
diff --git a/em-format/e-mail-formatter-quote.h b/em-format/e-mail-formatter-quote.h
index 380f94a806..c8662612a5 100644
--- a/em-format/e-mail-formatter-quote.h
+++ b/em-format/e-mail-formatter-quote.h
@@ -62,7 +62,6 @@ struct _EMailFormatterQuoteContext {
 
 struct _EMailFormatterQuote {
 	EMailFormatter parent;
-
 	EMailFormatterQuotePrivate *priv;
 };
 
diff --git a/em-format/e-mail-inline-filter.h b/em-format/e-mail-inline-filter.h
index 979ac46a12..df4c2bc0f9 100644
--- a/em-format/e-mail-inline-filter.h
+++ b/em-format/e-mail-inline-filter.h
@@ -35,10 +35,10 @@
 #define E_MAIL_INLINE_FILTER_CLASS(cls) \
 	(G_TYPE_CHECK_CLASS_CAST \
 	((cls), E_TYPE_MAIL_INLINE_FILTER, EMailInlineFilterClass))
-#define E_MAIL_IS_INLINE_FILTER(obj) \
+#define E_IS_MAIL_INLINE_FILTER(obj) \
 	(G_TYPE_CHECK_INSTANCE_TYPE \
 	((obj), E_TYPE_MAIL_INLINE_FILTER))
-#define E_MAIL_IS_INLINE_FILTER_CLASS(cls) \
+#define E_IS_MAIL_INLINE_FILTER_CLASS(cls) \
 	(G_TYPE_CHECK_CLASS_TYPE \
 	((cls), E_TYPE_MAIL_INLINE_FILTER))
 #define E_MAIL_INLINE_FILTER_GET_CLASS(obj) \
diff --git a/em-format/e-mail-parser-extension.c b/em-format/e-mail-parser-extension.c
index 69992a6020..68aac73cbf 100644
--- a/em-format/e-mail-parser-extension.c
+++ b/em-format/e-mail-parser-extension.c
@@ -40,7 +40,6 @@ e_mail_parser_extension_init (EMailParserExtension *extension)
  * @parser: a #EMailParser
  * @mime_part: (allow-none) a #CamelMimePart to parse
  * @part_id: a #GString to which parser will append ID of the parsed part.
- * @flags: #EMailParserFlags
  * @cancellable: (allow-none) A #GCancellable
  * @out_mail_parts: a #GQueue to deposit #EMailPart instances
  *
diff --git a/em-format/e-mail-part-utils.c b/em-format/e-mail-part-utils.c
index cbbedc51f0..0a24cf2ef4 100644
--- a/em-format/e-mail-part-utils.c
+++ b/em-format/e-mail-part-utils.c
@@ -35,7 +35,7 @@
 #define d(x)
 
 /**
- * e_mail_parst_is_secured:
+ * e_mail_part_is_secured:
  * @part: a #CamelMimePart
  *
  * Whether @part is signed or encrypted or not.
@@ -56,7 +56,7 @@ e_mail_part_is_secured (CamelMimePart *part)
 }
 
 /**
- * e_mail_partr_snoop_type:
+ * e_mail_part_snoop_type:
  * @part: a #CamelMimePart
  *
  * Tries to snoop the mime type of a part.
@@ -476,7 +476,7 @@ e_mail_part_build_uri (CamelFolder *folder,
 /**
  * e_mail_part_describe:
  * @part: a #CamelMimePart
- * @mimetype: mimetype of the content
+ * @mime_type: MIME type of the content
  *
  * Generate a simple textual description of a part, @mime_type represents
  * the content.
diff --git a/em-format/e-mail-stripsig-filter.h b/em-format/e-mail-stripsig-filter.h
index 730d55eaaf..75d3719133 100644
--- a/em-format/e-mail-stripsig-filter.h
+++ b/em-format/e-mail-stripsig-filter.h
@@ -34,10 +34,10 @@
 #define E_MAIL_STRIPSIG_FILTER_CLASS(cls) \
 	(G_TYPE_CHECK_CLASS_CAST \
 	((cls), E_TYPE_MAIL_STRIPSIG_FILTER, EMailStripSigFilterClass))
-#define E_MAIL_IS_STRIPSIG_FILTER(obj) \
+#define E_IS_MAIL_STRIPSIG_FILTER(obj) \
 	(G_TYPE_CHECK_INSTANCE_TYPE \
 	((obj), E_TYPE_MAIL_STRIPSIG_FILTER))
-#define E_MAIL_IS_STRIPSIG_FILTER_CLASS(cls) \
+#define E_IS_MAIL_STRIPSIG_FILTER_CLASS(cls) \
 	(G_TYPE_CHECK_CLASS_TYPE \
 	((cls), E_TYPE_MAIL_STRIPSIG_FILTER))
 #define E_MAIL_STRIPSIG_FILTER_GET_CLASS(obj) \