Merged notzed-eplugin-2-branch to head.

svn path=/trunk/; revision=27300

1 files changed, 45 insertions, 35 deletions

diff --git a/mail/Makefile.am b/mail/Makefile.am
index 888529cd1e..834ad77d4c 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -58,76 +58,86 @@ libevolution_mail_la_SOURCES =			\
 	$(MARSHAL_GENERATED)			\
 	e-searching-tokenizer.c			\
 	e-searching-tokenizer.h			\
+	em-account-editor.c			\
+	em-account-editor.h			\
 	em-account-prefs.c			\
 	em-account-prefs.h			\
 	em-composer-prefs.c			\
 	em-composer-prefs.h			\
-	em-mailer-prefs.c			\
-	em-mailer-prefs.h			\
-	em-inline-filter.c			\
-	em-inline-filter.h			\
+	em-composer-utils.c			\
+	em-composer-utils.h			\
+	em-config.c				\
+	em-config.h				\
+	em-event.c				\
+	em-event.h				\
 	em-filter-context.c			\
 	em-filter-context.h			\
 	em-filter-editor.c			\
 	em-filter-editor.h			\
-	em-filter-rule.c			\
-	em-filter-rule.h			\
 	em-filter-folder-element.c		\
 	em-filter-folder-element.h		\
-	em-filter-source-element.h		\
+	em-filter-rule.c			\
+	em-filter-rule.h			\
 	em-filter-source-element.c		\
+	em-filter-source-element.h		\
+	em-folder-browser.c			\
+	em-folder-browser.h			\
 	em-folder-properties.c			\
 	em-folder-properties.h			\
-	em-folder-selection.c			\
-	em-folder-selection.h			\
 	em-folder-selection-button.c		\
 	em-folder-selection-button.h		\
+	em-folder-selection.c			\
+	em-folder-selection.h			\
 	em-folder-selector.c			\
 	em-folder-selector.h			\
-	em-folder-tree.c			\
-	em-folder-tree.h			\
 	em-folder-tree-model.c			\
 	em-folder-tree-model.h			\
+	em-folder-tree.c			\
+	em-folder-tree.h			\
 	em-folder-view.c			\
 	em-folder-view.h			\
-	em-folder-browser.c			\
-	em-folder-browser.h			\
-	em-format.c				\
-	em-format.h				\
-	em-format-html.c			\
-	em-format-html.h			\
+	em-format-hook.c			\
+	em-format-hook.h			\
 	em-format-html-display.c		\
 	em-format-html-display.h		\
 	em-format-html-print.c			\
 	em-format-html-print.h			\
-	em-stripsig-filter.c			\
-	em-stripsig-filter.h			\
+	em-format-html.c			\
+	em-format-html.h			\
 	em-format-quote.c			\
 	em-format-quote.h			\
+	em-format.c				\
+	em-format.h				\
+	em-html-stream.c			\
+	em-html-stream.h			\
+	em-icon-stream.c			\
+	em-icon-stream.h			\
+	em-inline-filter.c			\
+	em-inline-filter.h			\
+	em-junk-filter.c			\
+	em-junk-filter.h			\
+	em-junk-plugin.c			\
+	em-junk-plugin.h			\
+	em-mailer-prefs.c			\
+	em-mailer-prefs.h			\
+	em-menu.c				\
+	em-menu.h				\
 	em-message-browser.c			\
 	em-message-browser.h			\
 	em-migrate.c				\
 	em-migrate.h				\
-	em-composer-utils.c			\
-	em-composer-utils.h			\
 	em-popup.c				\
 	em-popup.h				\
-	em-utils.c				\
-	em-utils.h				\
 	em-search-context.c			\
 	em-search-context.h			\
+	em-stripsig-filter.c			\
+	em-stripsig-filter.h			\
 	em-subscribe-editor.c			\
 	em-subscribe-editor.h			\
 	em-sync-stream.c			\
 	em-sync-stream.h			\
-	em-icon-stream.c			\
-	em-icon-stream.h			\
-	em-junk-filter.c			\
-	em-junk-filter.h			\
-	em-junk-plugin.c			\
-	em-junk-plugin.h			\
-	em-html-stream.c			\
-	em-html-stream.h			\
+	em-utils.c				\
+	em-utils.h				\
 	em-vfolder-context.c			\
 	em-vfolder-context.h			\
 	em-vfolder-editor.c			\
@@ -143,14 +153,14 @@ libevolution_mail_la_SOURCES =			\
 	mail-component-factory.c		\
 	mail-component.c			\
 	mail-component.h			\
-	mail-config.c				\
-	mail-config.h				\
 	mail-config-druid.c			\
 	mail-config-druid.h			\
-	mail-crypto.c				\
-	mail-crypto.h				\
 	mail-config-factory.c			\
 	mail-config-factory.h			\
+	mail-config.c				\
+	mail-config.h				\
+	mail-crypto.c				\
+	mail-crypto.h				\
 	mail-folder-cache.c			\
 	mail-folder-cache.h			\
 	mail-mt.c				\