** See #59885.

2004-06-17  Not Zed  <NotZed@Ximian.com>

        ** See #59885.

        ** Moved all of the mailer specific filter stuff into mail/*.

        * filter-element.c (copy_value): implement for base types.

        * filter-element.c (filter_element_copy_value): do this as a
        virtual method.

        * filter.glade: moved the vfolder stuff to mail/

        * libfilter-i18n.h: removed, moved to mailer.

        * filter-errors.xml: moved the vfolder/filtering errors to the
        mail error file.

        * Makefile.am (EXTRA_DIST): moved *types.xml to mail.
        (INCLUDES): removed a bunch of mail dependencies.

        * filter-*.[ch], vfolder-*.[ch]: Moved all mail related filter and
        vfolder stuff to mail directory.

        * score-*.[ch]: Removed all of it.

        * vfolder-context.c (vfolder_new_element): and for vfolders.

        * filter-context.c (filter_new_element): implement for filter
        element types.

        * rule-context.c (rc_new_element): replacement for old
        filter_element_new_type_name.  only has the basics.

        * filter-part.c (filter_part_xml_create): take a rule context
        as an argument & and look up the element name off the context.

        * rule-context.c (rule_context_new_element): new virtual method to
        get an element for a given name.

        * filter-element.c (filter_element_new_type_name): removed.

svn path=/trunk/; revision=26379

1 files changed, 2 insertions, 41 deletions

diff --git a/filter/Makefile.am b/filter/Makefile.am
index 0e7fd2f4b7..f84be24c73 100644
--- a/filter/Makefile.am
+++ b/filter/Makefile.am
@@ -3,9 +3,7 @@ glade_DATA = filter.glade
 
 INCLUDES = 					\
 	-I $(top_srcdir)			\
-	-I $(top_srcdir)/camel			\
 	-I $(top_srcdir)/e-util			\
-	-I $(top_srcdir)/shell			\
 	-I $(top_srcdir)/widgets/misc		\
 	-DFILTER_GLADEDIR=\"$(gladedir)\"	\
 	-DG_LOG_DOMAIN=\"filter\"		\
@@ -19,20 +17,12 @@ libfilter_la_SOURCES =				\
 	filter-code.h				\
 	filter-colour.c				\
 	filter-colour.h				\
-	filter-context.c			\
-	filter-context.h			\
 	filter-datespec.c			\
 	filter-datespec.h			\
-	filter-editor.c				\
-	filter-editor.h				\
 	filter-element.c			\
 	filter-element.h			\
 	filter-file.c				\
 	filter-file.h				\
-	filter-filter.c				\
-	filter-filter.h				\
-	filter-folder.c				\
-	filter-folder.h				\
 	filter-input.c				\
 	filter-input.h				\
 	filter-int.c				\
@@ -47,54 +37,25 @@ libfilter_la_SOURCES =				\
 	filter-part.h				\
 	filter-rule.c				\
 	filter-rule.h				\
-	filter-source.h				\
-	filter-source.c				\
 	rule-context.c				\
 	rule-context.h				\
 	rule-editor.c				\
-	rule-editor.h				\
-	score-context.c				\
-	score-context.h				\
-	score-editor.c				\
-	score-editor.h				\
-	score-rule.c				\
-	score-rule.h				\
-	vfolder-context.c			\
-	vfolder-context.h			\
-	vfolder-editor.c			\
-	vfolder-editor.h			\
-	vfolder-rule.c				\
-	vfolder-rule.h
-
-libfilter_la_DEPENDENCIES = libfilter-i18n.h
+	rule-editor.h
 
 EXTRA_DIST =					\
 	$(glade_DATA)				\
 	$(error_DATA)				\
 	$(error_i18n)				\
 	ChangeLog.pre-1-4			\
-	filter-marshal.list			\
-	filtertypes.xml				\
-	libfilter-i18n.h			\
-	vfoldertypes.xml			\
-	searchtypes.xml
+	filter-marshal.list
 
 # basic rules.
-filterdir = $(privdatadir)
-filter_DATA = filtertypes.xml vfoldertypes.xml searchtypes.xml
-
 error_DATA = filter-errors.xml
 error_i18n = $(error_DATA:.xml=.xml.h)
 errordir = $(privdatadir)/errors
 %.xml.h: %.xml
 	$(top_builddir)/e-util/e-error-tool $^
 
-libfilter-i18n.h: filtertypes.xml vfoldertypes.xml
-	echo "/* Automatically generated. Do not edit. */" > $@;	      \
-	cat $(srcdir)/filtertypes.xml $(srcdir)/vfoldertypes.xml |	      \
-		sed -n -e 's:.*<title>\(.*\)</title>:char *s = N_("\1");:p' | \
-		sort -u >> $@
-
 MARSHAL_GENERATED = filter-marshal.c filter-marshal.h
 @EVO_MARSHAL_RULE@