From 81a0ff5bc44a3bd11399e6b3c985735737606c8c Mon Sep 17 00:00:00 2001
From: Not Zed <NotZed@Ximian.com>
Date: Wed, 17 Sep 2003 21:19:04 +0000
Subject: cvs removed.

2003-09-17  Not Zed  <NotZed@Ximian.com>

         * folder-browser.c, folder-browser.h, folder-browser-ui.c
         folder-browser-ui.h, mail-callbacks.c, mail-callbacks.h
         mail-display.c, mail-display.h, mail-display-stream.c
         mail-display-stream.h, mail-format.c, mail-format.h
         mail-identify.c, mail-search.c, mail-search.h
         message-browser.c, message-browser.h, subscribe-dialog.c
         subscribe-dialog.h, mail-font-prefs.c, mail-font-prefs.h: cvs
         removed.

        * Makefile.am: Removed mail-font-prefs.[ch], hasn't been built for
        ages.

        * em-*.c: killed a bunch of printfs.

        * em-format-html-display.c (efhd_html_button_press_event): update
        for html object api chagnes.

        ** Merge in mail-refactor-2 branch.

svn path=/trunk/; revision=22602
---
 mail/Makefile.am | 64 +++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 40 insertions(+), 24 deletions(-)

(limited to 'mail/Makefile.am')

diff --git a/mail/Makefile.am b/mail/Makefile.am
index b1b93266cb..d7d2d347cc 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -70,12 +70,44 @@ libevolution_mail_la_SOURCES =		\
 	component-factory.h		\
 	e-searching-tokenizer.c		\
 	e-searching-tokenizer.h		\
-	folder-browser.c		\
-	folder-browser.h		\
+	em-inline-filter.c		\
+	em-inline-filter.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-html-display.c	\
+	em-format-html-display.h	\
+	em-format-html-print.c		\
+	em-format-html-print.h		\
+	em-format-html-quote.c		\
+	em-format-html-quote.h		\
+	em-format-quote.c		\
+	em-format-quote.h		\
+	em-marshal.c			\
+	em-marshal.h			\
+	em-message-browser.c		\
+	em-message-browser.h		\
+	em-composer-utils.c		\
+	em-composer-utils.h		\
+	em-popup.c			\
+	em-popup.h			\
+	em-utils.c			\
+	em-utils.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-html-stream.c		\
+	em-html-stream.h		\
 	folder-browser-factory.c	\
 	folder-browser-factory.h	\
-	folder-browser-ui.c		\
-	folder-browser-ui.h		\
 	folder-info.c			\
 	folder-info.h			\
 	mail-account-editor.c		\
@@ -86,8 +118,6 @@ libevolution_mail_la_SOURCES =		\
 	mail-accounts.h			\
 	mail-autofilter.c		\
 	mail-autofilter.h		\
-	mail-callbacks.c		\
-	mail-callbacks.h		\
 	mail-composer-prefs.c		\
 	mail-composer-prefs.h		\
 	mail-config.c			\
@@ -100,15 +130,8 @@ libevolution_mail_la_SOURCES =		\
 	mail-config-factory.h		\
 	mail-preferences.c		\
 	mail-preferences.h		\
-	mail-display.c			\
-	mail-display.h			\
-	mail-display-stream.c		\
-	mail-display-stream.h		\
 	mail-folder-cache.c		\
 	mail-folder-cache.h		\
-	mail-format.h			\
-	mail-format.c			\
-	mail-identify.c			\
 	mail-importer.c			\
 	mail-importer.h			\
 	mail-local.c			\
@@ -119,8 +142,6 @@ libevolution_mail_la_SOURCES =		\
 	mail-offline-handler.h		\
 	mail-ops.c			\
 	mail-ops.h			\
-	mail-search.c			\
-	mail-search.h			\
 	mail-send-recv.c		\
 	mail-send-recv.h		\
 	mail-session.c			\
@@ -132,22 +153,14 @@ libevolution_mail_la_SOURCES =		\
 	mail-types.h			\
 	mail-vfolder.c			\
 	mail-vfolder.h			\
-	message-browser.c		\
-	message-browser.h		\
 	message-list.c			\
 	message-list.h			\
 	message-tag-editor.c		\
 	message-tag-editor.h		\
 	message-tag-followup.c		\
 	message-tag-followup.h		\
-	subscribe-dialog.c		\
-	subscribe-dialog.h		\
 	mail.h
 
-# needs gtkhtml prop manager ported
-#	mail-font-prefs.c		\
-#	mail-font-prefs.h
-
 libevolution_mail_la_LIBADD =					\
 	$(top_builddir)/shell/importer/libevolution-importer.la	\
 	$(top_builddir)/camel/libcamel.la			\
@@ -177,7 +190,10 @@ server_DATA = $(server_in_files:.server.in.in=.server)
 	sed -e "s|\@COMPONENTDIR\@|$(componentdir)|" $< > $@
 @INTLTOOL_SERVER_RULE@
 
-glade_DATA = mail-config.glade local-config.glade subscribe-dialog.glade message-tags.glade
+MARSHAL_GENERATED = em-marshal.c em-marshal.h
+@EVO_MARSHAL_RULE@
+
+glade_DATA = mail-config.glade local-config.glade subscribe-dialog.glade message-tags.glade mail-search.glade
 
 etspec_DATA = mail-accounts.etspec message-list.etspec subscribe-dialog.etspec
 
-- 
cgit