From 9bfe38c419c7b864b4e1a5f4f2b50416a1e08e41 Mon Sep 17 00:00:00 2001 From: Matthew Barnes 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. --- calendar/alarm-notify/Makefile.am | 2 +- calendar/gui/Makefile.am | 2 +- composer/Makefile.am | 16 +- composer/e-composer-name-header.h | 3 +- composer/e-msg-composer.c | 3 +- composer/e-msg-composer.h | 2 +- configure.ac | 1 + doc/reference/Makefile.am | 1 + doc/reference/evolution-mail-composer/Makefile.am | 40 ++++ .../evolution-mail-composer-docs.sgml | 40 ++++ .../evolution-mail-composer-overrides.txt | 0 .../evolution-mail-composer-sections.txt | 246 +++++++++++++++++++++ .../evolution-mail-composer.types | 19 ++ evolution-mail.pc.in | 2 +- mail/Makefile.am | 2 +- modules/addressbook/Makefile.am | 2 +- modules/composer-autosave/Makefile.am | 2 +- modules/mail/Makefile.am | 2 +- plugins/attachment-reminder/Makefile.am | 2 +- plugins/bbdb/Makefile.am | 2 +- plugins/email-custom-header/Makefile.am | 2 +- plugins/external-editor/Makefile.am | 2 +- plugins/face/Makefile.am | 2 +- plugins/mailing-list-actions/Makefile.am | 2 +- plugins/templates/Makefile.am | 2 +- 25 files changed, 374 insertions(+), 25 deletions(-) create mode 100644 doc/reference/evolution-mail-composer/Makefile.am create mode 100644 doc/reference/evolution-mail-composer/evolution-mail-composer-docs.sgml create mode 100644 doc/reference/evolution-mail-composer/evolution-mail-composer-overrides.txt create mode 100644 doc/reference/evolution-mail-composer/evolution-mail-composer-sections.txt create mode 100644 doc/reference/evolution-mail-composer/evolution-mail-composer.types diff --git a/calendar/alarm-notify/Makefile.am b/calendar/alarm-notify/Makefile.am index fb257b3485..09a6743dcf 100644 --- a/calendar/alarm-notify/Makefile.am +++ b/calendar/alarm-notify/Makefile.am @@ -43,7 +43,7 @@ evolution_alarm_notify_SOURCES = \ evolution_alarm_notify_LDADD = \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/composer/libcomposer.la \ + $(top_builddir)/composer/libevolution-mail-composer.la \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(top_builddir)/calendar/importers/libevolution-calendar-importers.la \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 6d19691d72..b7ee4164aa 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -200,7 +200,7 @@ libevolution_calendar_la_SOURCES = \ ea-gnome-calendar.h libevolution_calendar_la_LIBADD = \ - $(top_builddir)/composer/libcomposer.la \ + $(top_builddir)/composer/libevolution-mail-composer.la \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ $(top_builddir)/shell/libevolution-shell.la \ 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, diff --git a/configure.ac b/configure.ac index 2254278127..95a672d164 100644 --- a/configure.ac +++ b/configure.ac @@ -1429,6 +1429,7 @@ data/evolution-alarm-notify.desktop.in data/icons/Makefile doc/Makefile doc/reference/Makefile +doc/reference/evolution-mail-composer/Makefile doc/reference/evolution-mail-formatter/Makefile doc/reference/evolution-shell/Makefile doc/reference/evolution-util/Makefile diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am index 8ac97d0f8f..b596aa20ed 100644 --- a/doc/reference/Makefile.am +++ b/doc/reference/Makefile.am @@ -1,6 +1,7 @@ NULL = SUBDIRS = \ + evolution-mail-composer \ evolution-mail-formatter \ evolution-shell \ evolution-util \ diff --git a/doc/reference/evolution-mail-composer/Makefile.am b/doc/reference/evolution-mail-composer/Makefile.am new file mode 100644 index 0000000000..580dc63a3b --- /dev/null +++ b/doc/reference/evolution-mail-composer/Makefile.am @@ -0,0 +1,40 @@ +# The name of the module. +DOC_MODULE=evolution-mail-composer + +# The top-level SGML file. +DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml + +# The directory containing the source code. Relative to $(srcdir). +DOC_SOURCE_DIR=$(top_srcdir)/composer + +# Used for dependencies. The docs will be rebuilt if any of these change. +HFILE_GLOB=$(top_srcdir)/composer/*.h +CFILE_GLOB=$(top_srcdir)/composer/*.c + +# Header files to ignore when scanning. +IGNORE_HFILES= \ + e-composer-actions.h \ + e-composer-private.h \ + $(NULL) + +GTKDOC_CFLAGS= \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) \ + $(GTKHTML_CFLAGS) \ + $(NULL) + +GTKDOC_LIBS= \ + $(top_builddir)/composer/libevolution-mail-composer.la \ + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) \ + $(NULL) + +# This includes the standard gtk-doc make rules, copied by gtkdocize. +include $(top_srcdir)/gtk-doc.make + +#TESTS = $(GTKDOC_CHECK) + +-include $(top_srcdir)/git.mk diff --git a/doc/reference/evolution-mail-composer/evolution-mail-composer-docs.sgml b/doc/reference/evolution-mail-composer/evolution-mail-composer-docs.sgml new file mode 100644 index 0000000000..becbfd678f --- /dev/null +++ b/doc/reference/evolution-mail-composer/evolution-mail-composer-docs.sgml @@ -0,0 +1,40 @@ + + +]> + + + Evolution Mail Composer Reference Manual + + The latest version of this documentation can be found on-line at + http://developer.gnome.org/evolution-mail-composer/. + + + + + Mail Composition + + + + + + + + + + + + + Object Hierarchy + + + + + API Index + + + + + diff --git a/doc/reference/evolution-mail-composer/evolution-mail-composer-overrides.txt b/doc/reference/evolution-mail-composer/evolution-mail-composer-overrides.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/doc/reference/evolution-mail-composer/evolution-mail-composer-sections.txt b/doc/reference/evolution-mail-composer/evolution-mail-composer-sections.txt new file mode 100644 index 0000000000..24090de34d --- /dev/null +++ b/doc/reference/evolution-mail-composer/evolution-mail-composer-sections.txt @@ -0,0 +1,246 @@ +
+e-composer-activity +EComposerActivity +EComposerActivity +e_composer_activity_new +e_composer_activity_get_composer + +E_COMPOSER_ACTIVITY +E_IS_COMPOSER_ACTIVITY +E_TYPE_COMPOSER_ACTIVITY +E_COMPOSER_ACTIVITY_CLASS +E_IS_COMPOSER_ACTIVITY_CLASS +E_COMPOSER_ACTIVITY_GET_CLASS +EComposerActivityClass +e_composer_activity_get_type + +EComposerActivityPrivate +
+ +
+e-composer-from-header +EComposerFromHeader +EComposerFromHeader +e_composer_from_header_new +e_composer_from_header_get_active_id +e_composer_from_header_set_active_id + +E_COMPOSER_FROM_HEADER +E_IS_COMPOSER_FROM_HEADER +E_TYPE_COMPOSER_FROM_HEADER +E_COMPOSER_FROM_HEADER_CLASS +E_IS_COMPOSER_FROM_HEADER_CLASS +E_COMPOSER_FROM_HEADER_GET_CLASS +EComposerFromHeaderClass +e_composer_from_header_get_type +
+ +
+e-composer-header-table +EComposerHeaderTable +EComposerHeaderTable +e_composer_header_table_new +e_composer_header_table_get_shell +e_composer_header_table_get_registry +EComposerHeaderType +e_composer_header_table_get_header +e_composer_header_table_get_signature_combo_box +e_composer_header_table_get_destinations +e_composer_header_table_get_destinations_bcc +e_composer_header_table_add_destinations_bcc +e_composer_header_table_set_destinations_bcc +e_composer_header_table_get_destinations_cc +e_composer_header_table_add_destinations_cc +e_composer_header_table_set_destinations_cc +e_composer_header_table_get_destinations_to +e_composer_header_table_add_destinations_to +e_composer_header_table_set_destinations_to +e_composer_header_table_get_identity_uid +e_composer_header_table_set_identity_uid +e_composer_header_table_get_post_to +e_composer_header_table_set_post_to_base +e_composer_header_table_set_post_to_list +e_composer_header_table_get_reply_to +e_composer_header_table_set_reply_to +e_composer_header_table_get_signature_uid +e_composer_header_table_set_signature_uid +e_composer_header_table_get_subject +e_composer_header_table_set_subject +e_composer_header_table_set_header_visible + +E_COMPOSER_HEADER_TABLE +E_IS_COMPOSER_HEADER_TABLE +E_TYPE_COMPOSER_HEADER_TABLE +E_COMPOSER_HEADER_TABLE_CLASS +E_IS_COMPOSER_HEADER_TABLE_CLASS +E_COMPOSER_HEADER_TABLE_GET_CLASS +EComposerHeaderTableClass +e_composer_header_table_get_type + +EComposerHeaderTablePrivate +
+ +
+e-composer-header +EComposerHeader +EComposerHeader +e_composer_header_get_label +e_composer_header_get_registry +e_composer_header_get_sensitive +e_composer_header_set_sensitive +e_composer_header_get_visible +e_composer_header_set_visible +e_composer_header_set_title_tooltip +e_composer_header_set_input_tooltip + +E_COMPOSER_HEADER +E_IS_COMPOSER_HEADER +E_TYPE_COMPOSER_HEADER +E_COMPOSER_HEADER_CLASS +E_IS_COMPOSER_HEADER_CLASS +E_COMPOSER_HEADER_GET_CLASS +EComposerHeaderClass +e_composer_header_get_type + +EComposerHeaderPrivate +
+ +
+e-composer-name-header +EComposerNameHeader +EComposerNameHeader +e_composer_name_header_new +e_composer_name_header_get_name_selector +e_composer_name_header_get_destinations +e_composer_name_header_add_destinations +e_composer_name_header_set_destinations + +E_COMPOSER_NAME_HEADER +E_IS_COMPOSER_NAME_HEADER +E_TYPE_COMPOSER_NAME_HEADER +E_COMPOSER_NAME_HEADER_CLASS +E_IS_COMPOSER_NAME_HEADER_CLASS +E_COMPOSER_NAME_HEADER_GET_CLASS +EComposerNameHeaderClass +e_composer_name_header_get_type + +EComposerNameHeaderPrivate +
+ +
+e-composer-post-header +EComposerPostHeader +EComposerPostHeader +e_composer_post_header_new +e_composer_post_header_get_folders +e_composer_post_header_set_folders +e_composer_post_header_set_folders_base +e_composer_post_header_get_mail_account +e_composer_post_header_set_mail_account + +E_COMPOSER_POST_HEADER +E_IS_COMPOSER_POST_HEADER +E_TYPE_COMPOSER_POST_HEADER +E_COMPOSER_POST_HEADER_CLASS +E_IS_COMPOSER_POST_HEADER_CLASS +E_COMPOSER_POST_HEADER_GET_CLASS +EComposerPostHeaderClass +e_composer_post_header_get_type + +EComposerPostHeaderPrivate +
+ +
+e-composer-spell-header +EComposerSpellHeader +EComposerSpellHeader +e_composer_spell_header_new_label +e_composer_spell_header_new_button +e_composer_spell_header_set_languages + +E_COMPOSER_SPELL_HEADER +E_IS_COMPOSER_SPELL_HEADER +E_TYPE_COMPOSER_SPELL_HEADER +E_COMPOSER_SPELL_HEADER_CLASS +E_IS_COMPOSER_SPELL_HEADER_CLASS +E_COMPOSER_SPELL_HEADER_GET_CLASS +EComposerSpellHeaderClass +e_composer_spell_header_get_type +
+ +
+e-composer-text-header +EComposerTextHeader +EComposerTextHeader +e_composer_text_header_new_label +e_composer_text_header_new_button +e_composer_text_header_get_text +e_composer_text_header_set_text + +E_COMPOSER_TEXT_HEADER +E_IS_COMPOSER_TEXT_HEADER +E_TYPE_COMPOSER_TEXT_HEADER +E_COMPOSER_TEXT_HEADER_CLASS +E_IS_COMPOSER_TEXT_HEADER_CLASS +E_COMPOSER_TEXT_HEADER_GET_CLASS +EComposerTextHeaderClass +e_composer_text_header_get_type +
+ +
+e-msg-composer +EMsgComposer +EMsgComposer +e_msg_composer_new +e_msg_composer_new_with_message +e_msg_composer_new_from_url +e_msg_composer_new_redirect +e_msg_composer_get_focus_tracker +e_msg_composer_ref_session +e_msg_composer_get_shell +e_msg_composer_get_web_view +e_msg_composer_send +e_msg_composer_save_to_drafts +e_msg_composer_save_to_outbox +e_msg_composer_print +e_msg_composer_set_body_text +e_msg_composer_set_body +e_msg_composer_add_header +e_msg_composer_set_header +e_msg_composer_remove_header +e_msg_composer_set_draft_headers +e_msg_composer_set_source_headers +e_msg_composer_attach +e_msg_composer_add_inline_image_from_file +e_msg_composer_add_inline_image_from_mime_part +e_msg_composer_get_message +e_msg_composer_get_message_finish +e_msg_composer_get_message_print +e_msg_composer_get_message_print_finish +e_msg_composer_get_message_draft +e_msg_composer_get_message_draft_finish +e_msg_composer_get_from +e_msg_composer_get_reply_to +e_msg_composer_clear_inlined_table +e_msg_composer_add_message_attachments +e_msg_composer_request_close +e_msg_composer_can_close +e_msg_composer_reply_indent +e_msg_composer_get_header_table +e_msg_composer_get_attachment_view +e_msg_composer_get_raw_message_text +e_msg_composer_is_exiting +e_load_spell_languages +e_save_spell_languages + +E_MSG_COMPOSER +E_IS_MSG_COMPOSER +E_TYPE_MSG_COMPOSER +E_MSG_COMPOSER_CLASS +E_IS_MSG_COMPOSER_CLASS +E_MSG_COMPOSER_GET_CLASS +EMsgComposerClass +e_msg_composer_get_type + +EMsgComposerPrivate +
diff --git a/doc/reference/evolution-mail-composer/evolution-mail-composer.types b/doc/reference/evolution-mail-composer/evolution-mail-composer.types new file mode 100644 index 0000000000..bf4ab7c4d6 --- /dev/null +++ b/doc/reference/evolution-mail-composer/evolution-mail-composer.types @@ -0,0 +1,19 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include + +e_composer_activity_get_type +e_composer_from_header_get_type +e_composer_header_get_type +e_composer_header_table_get_type +e_composer_name_header_get_type +e_composer_post_header_get_type +e_composer_spell_header_get_type +e_composer_text_header_get_type +e_msg_composer_get_type diff --git a/evolution-mail.pc.in b/evolution-mail.pc.in index e2bdf78139..89ff01dc47 100644 --- a/evolution-mail.pc.in +++ b/evolution-mail.pc.in @@ -13,5 +13,5 @@ Name: Evolution Mail Description: Mail utilities for Evolution Version: @VERSION@ Requires: evolution-shell-3.0 camel-1.2 libemail-engine -Libs: -L${privlibdir} -levolution-mail -lcomposer +Libs: -L${privlibdir} -levolution-mail -levolution-mail-composer Cflags: -I${privincludedir} diff --git a/mail/Makefile.am b/mail/Makefile.am index f9d9d1dc9f..8661d80a33 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -193,7 +193,7 @@ libevolution_mail_la_LIBADD = \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(top_builddir)/e-util/libevolution-util.la \ $(top_builddir)/shell/libevolution-shell.la \ - $(top_builddir)/composer/libcomposer.la \ + $(top_builddir)/composer/libevolution-mail-composer.la \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ $(top_builddir)/em-format/libevolution-mail-formatter.la \ diff --git a/modules/addressbook/Makefile.am b/modules/addressbook/Makefile.am index 179fb78928..8faf8a3967 100644 --- a/modules/addressbook/Makefile.am +++ b/modules/addressbook/Makefile.am @@ -52,7 +52,7 @@ endif module_addressbook_la_LIBADD = \ $(SMIME_LIB) \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/composer/libcomposer.la \ + $(top_builddir)/composer/libevolution-mail-composer.la \ $(top_builddir)/addressbook/printing/libecontactprint.la \ $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \ diff --git a/modules/composer-autosave/Makefile.am b/modules/composer-autosave/Makefile.am index 08f3c480e7..b8f30576af 100644 --- a/modules/composer-autosave/Makefile.am +++ b/modules/composer-autosave/Makefile.am @@ -17,7 +17,7 @@ module_composer_autosave_la_SOURCES = \ module_composer_autosave_la_LIBADD = \ $(top_builddir)/shell/libevolution-shell.la \ - $(top_builddir)/composer/libcomposer.la \ + $(top_builddir)/composer/libevolution-mail-composer.la \ $(top_builddir)/e-util/libevolution-util.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ diff --git a/modules/mail/Makefile.am b/modules/mail/Makefile.am index 4090356408..29e8388109 100644 --- a/modules/mail/Makefile.am +++ b/modules/mail/Makefile.am @@ -45,7 +45,7 @@ module_mail_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(top_builddir)/em-format/libevolution-mail-formatter.la \ $(top_builddir)/shell/libevolution-shell.la \ - $(top_builddir)/composer/libcomposer.la \ + $(top_builddir)/composer/libevolution-mail-composer.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/mail/importers/libevolution-mail-importers.la \ $(libevolution_mail_settings_la) \ diff --git a/plugins/attachment-reminder/Makefile.am b/plugins/attachment-reminder/Makefile.am index 36f15a011d..e4a7d99cc0 100644 --- a/plugins/attachment-reminder/Makefile.am +++ b/plugins/attachment-reminder/Makefile.am @@ -23,7 +23,7 @@ liborg_gnome_evolution_attachment_reminder_la_SOURCES = attachment-reminder.c liborg_gnome_evolution_attachment_reminder_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_evolution_attachment_reminder_la_LIBADD = \ - $(top_builddir)/composer/libcomposer.la \ + $(top_builddir)/composer/libevolution-mail-composer.la \ $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ diff --git a/plugins/bbdb/Makefile.am b/plugins/bbdb/Makefile.am index 958c6436e9..3248bbb51c 100644 --- a/plugins/bbdb/Makefile.am +++ b/plugins/bbdb/Makefile.am @@ -26,7 +26,7 @@ liborg_gnome_evolution_bbdb_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_evolution_bbdb_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ $(top_builddir)/shell/libevolution-shell.la \ - $(top_builddir)/composer/libcomposer.la \ + $(top_builddir)/composer/libevolution-mail-composer.la \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ diff --git a/plugins/email-custom-header/Makefile.am b/plugins/email-custom-header/Makefile.am index 8c5f05971f..178d1a104d 100644 --- a/plugins/email-custom-header/Makefile.am +++ b/plugins/email-custom-header/Makefile.am @@ -20,7 +20,7 @@ liborg_gnome_email_custom_header_la_SOURCES = \ liborg_gnome_email_custom_header_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/composer/libcomposer.la \ + $(top_builddir)/composer/libevolution-mail-composer.la \ $(top_builddir)/mail/libevolution-mail.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ diff --git a/plugins/external-editor/Makefile.am b/plugins/external-editor/Makefile.am index dab9c0412c..90d8655291 100644 --- a/plugins/external-editor/Makefile.am +++ b/plugins/external-editor/Makefile.am @@ -37,7 +37,7 @@ liborg_gnome_external_editor_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) liborg_gnome_external_editor_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/composer/libcomposer.la \ + $(top_builddir)/composer/libevolution-mail-composer.la \ $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ diff --git a/plugins/face/Makefile.am b/plugins/face/Makefile.am index 207456abc3..45bbbd5a4c 100644 --- a/plugins/face/Makefile.am +++ b/plugins/face/Makefile.am @@ -18,7 +18,7 @@ liborg_gnome_face_la_SOURCES = face.c liborg_gnome_face_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/composer/libcomposer.la \ + $(top_builddir)/composer/libevolution-mail-composer.la \ $(top_builddir)/mail/libevolution-mail.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ diff --git a/plugins/mailing-list-actions/Makefile.am b/plugins/mailing-list-actions/Makefile.am index 4914ed7a05..2da8d9b89f 100644 --- a/plugins/mailing-list-actions/Makefile.am +++ b/plugins/mailing-list-actions/Makefile.am @@ -17,7 +17,7 @@ liborg_gnome_mailing_list_actions_la_LDFLAGS = -module -avoid-version $(NO_UNDEF liborg_gnome_mailing_list_actions_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/composer/libcomposer.la \ + $(top_builddir)/composer/libevolution-mail-composer.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ diff --git a/plugins/templates/Makefile.am b/plugins/templates/Makefile.am index 6848aa887b..ccb3d56626 100644 --- a/plugins/templates/Makefile.am +++ b/plugins/templates/Makefile.am @@ -19,7 +19,7 @@ liborg_gnome_templates_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_templates_la_LIBADD = \ $(top_builddir)/e-util/libevolution-util.la \ - $(top_builddir)/composer/libcomposer.la \ + $(top_builddir)/composer/libevolution-mail-composer.la \ $(top_builddir)/shell/libevolution-shell.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ -- cgit