From 9bfe38c419c7b864b4e1a5f4f2b50416a1e08e41 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Mon, 27 May 2013 21:35:13 -0400
Subject: Rename libcomposer to libevolution-mail-composer.

To make Evolution's shared libraries more consistent.

Also add an evolution-mail-composer documentation module.
---
 composer/Makefile.am              | 16 ++++++++--------
 composer/e-composer-name-header.h |  3 ++-
 composer/e-msg-composer.c         |  3 ++-
 composer/e-msg-composer.h         |  2 +-
 4 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'composer')

diff --git a/composer/Makefile.am b/composer/Makefile.am
index 3352c1810d..98eff3802f 100644
--- a/composer/Makefile.am
+++ b/composer/Makefile.am
@@ -4,11 +4,11 @@ errordir = $(privdatadir)/errors
 # provides error rule
 @EVO_PLUGIN_RULE@
 
-privsolib_LTLIBRARIES = libcomposer.la
+privsolib_LTLIBRARIES = libevolution-mail-composer.la
 
-libcomposerincludedir = $(privincludedir)/composer
+evolution_mail_composer_includedir = $(privincludedir)/composer
 
-libcomposerinclude_HEADERS = 			\
+evolution_mail_composer_include_HEADERS = 	\
 	e-composer-actions.h			\
 	e-composer-activity.h			\
 	e-composer-common.h			\
@@ -22,7 +22,7 @@ libcomposerinclude_HEADERS = 			\
 	e-composer-text-header.h		\
 	e-msg-composer.h
 
-libcomposer_la_CPPFLAGS =						\
+libevolution_mail_composer_la_CPPFLAGS =				\
 	$(AM_CPPFLAGS)							\
 	-I$(top_srcdir)							\
 	-I$(top_builddir)						\
@@ -38,8 +38,8 @@ libcomposer_la_CPPFLAGS =						\
 	$(GNOME_PLATFORM_CFLAGS)					\
 	$(GTKHTML_CFLAGS)
 
-libcomposer_la_SOURCES = 			\
-	$(libcomposerinclude_HEADERS)		\
+libevolution_mail_composer_la_SOURCES =		\
+	$(evolution_mail_composer_include_HEADERS) \
 	e-composer-actions.c			\
 	e-composer-activity.c			\
 	e-composer-from-header.c		\
@@ -52,9 +52,9 @@ libcomposer_la_SOURCES = 			\
 	e-composer-text-header.c		\
 	e-msg-composer.c
 
-libcomposer_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
+libevolution_mail_composer_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
-libcomposer_la_LIBADD =					\
+libevolution_mail_composer_la_LIBADD =			\
 	$(top_builddir)/e-util/libevolution-util.la	\
 	$(top_builddir)/shell/libevolution-shell.la	\
 	$(top_builddir)/em-format/libevolution-mail-formatter.la \
diff --git a/composer/e-composer-name-header.h b/composer/e-composer-name-header.h
index 5632ddf0c0..fea50fa59a 100644
--- a/composer/e-composer-name-header.h
+++ b/composer/e-composer-name-header.h
@@ -57,7 +57,8 @@ struct _EComposerNameHeaderClass {
 };
 
 GType		e_composer_name_header_get_type	(void);
-EComposerHeader * e_composer_name_header_new	(ESourceRegistry *registry,
+EComposerHeader *
+		e_composer_name_header_new	(ESourceRegistry *registry,
 						 const gchar *label,
 						 ENameSelector *name_selector);
 ENameSelector *	e_composer_name_header_get_name_selector
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index bad162a006..0a3a3223f7 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -3055,6 +3055,7 @@ composer_add_auto_recipients (ESource *source,
  * @shell: an #EShell
  * @message: The message to use as the source
  * @keep_signature: Keep message signature, if any
+ * @cancellable: optional #GCancellable object, or %NULL
  *
  * Create a new message composer widget.
  *
@@ -3065,7 +3066,7 @@ composer_add_auto_recipients (ESource *source,
 EMsgComposer *
 e_msg_composer_new_with_message (EShell *shell,
                                  CamelMimeMessage *message,
-				 gboolean keep_signature,
+                                 gboolean keep_signature,
                                  GCancellable *cancellable)
 {
 	CamelInternetAddress *to, *cc, *bcc;
diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h
index 7c05668543..f702d3dfb1 100644
--- a/composer/e-msg-composer.h
+++ b/composer/e-msg-composer.h
@@ -85,7 +85,7 @@ struct _EMsgComposerClass {
 GType		e_msg_composer_get_type		(void);
 EMsgComposer *	e_msg_composer_new		(EShell *shell);
 EMsgComposer *	e_msg_composer_new_with_message	(EShell *shell,
-						 CamelMimeMessage *msg,
+						 CamelMimeMessage *message,
 						 gboolean keep_signature,
 						 GCancellable *cancellable);
 EMsgComposer *	e_msg_composer_new_from_url	(EShell *shell,
-- 
cgit v1.2.3