From a218c7d2f7e86bccc7665a3c96569eb14d1c75da Mon Sep 17 00:00:00 2001 From: Not Zed Date: Thu, 17 Jun 2004 07:34:50 +0000 Subject: ** See #59885. 2004-06-17 Not Zed ** See #59885. ** Moved all of the mail specific filtering stuff from filter/* to here. Renamed appropriately into em* space, etc. * em-filter-folder-element.c (emff_copy_value): implement for folders. * em-vfolder-rule.c (get_widget): read the vfolder glade from mail-config.glade. * mail-config.glade: moved the vfolder source selector here. * em-search-context.c: new mail search specific rule context. * mail-component.c (setup_search_context): use the new em_search_context. * vfolder-rule.c (validate): change error to mail context. * filter-folder.c (validate): change error to mail context. * Makefile.am (em-filter-i18n.h): added rule for i18n of mail filter type stuff. (libevolution_mail_la_SOURCES): added in the filter and vfolder rule stuff specific to mail. ** See #59885. * em-format-html-quote.[ch]: remove and remove from build, not used. * Makefile.am (libevolution_mail_la_LIBADD): add libeabutil and evolutionsmime. * mail-component-factory.c (factory): there is no mail_config anymore. svn path=/trunk/; revision=26380 --- mail/Makefile.am | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) (limited to 'mail/Makefile.am') diff --git a/mail/Makefile.am b/mail/Makefile.am index 8e31f7a068..29e4f303e9 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -66,6 +66,16 @@ libevolution_mail_la_SOURCES = \ em-mailer-prefs.h \ em-inline-filter.c \ em-inline-filter.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-source-element.c \ em-folder-properties.c \ em-folder-properties.h \ em-folder-selection.c \ @@ -104,6 +114,8 @@ libevolution_mail_la_SOURCES = \ em-popup.h \ em-utils.c \ em-utils.h \ + em-search-context.c \ + em-search-context.h \ em-subscribe-editor.c \ em-subscribe-editor.h \ em-sync-stream.c \ @@ -116,6 +128,12 @@ libevolution_mail_la_SOURCES = \ em-junk-plugin.h \ em-html-stream.c \ em-html-stream.h \ + em-vfolder-context.c \ + em-vfolder-context.h \ + em-vfolder-editor.c \ + em-vfolder-editor.h \ + em-vfolder-rule.c \ + em-vfolder-rule.h \ mail-account-editor.c \ mail-account-editor.h \ mail-account-gui.c \ @@ -181,6 +199,8 @@ libevolution_mail_la_LIBADD = \ libevolution_mail_la_LDFLAGS = \ -avoid-version -module +libevolution_mail_la_DEPENDENCIES = em-filter-i18n.h + # .server files server_in_files = GNOME_Evolution_Mail.server.in.in @@ -189,6 +209,8 @@ server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server) @INTLTOOL_SERVER_RULE@ # Misc data to install +filterdir = $(privdatadir) +filter_DATA = filtertypes.xml vfoldertypes.xml searchtypes.xml error_DATA = mail-errors.xml error_i18n = $(error_DATA:.xml=.xml.h) @@ -196,6 +218,12 @@ errordir = $(privdatadir)/errors %.xml.h: %.xml $(top_builddir)/e-util/e-error-tool $^ +em-filter-i18n.h: filtertypes.xml vfoldertypes.xml searchtypes.xml + echo "/* Automatically generated. Do not edit. */" > $@; \ + cat $(srcdir)/filtertypes.xml $(srcdir)/vfoldertypes.xml $(srcdir)/searchtypes.xml | \ + sed -n -e 's:.*\(.*\):char *s = N_("\1");:p' | \ + sort -u >> $@ + glade_DATA = mail-config.glade subscribe-dialog.glade message-tags.glade mail-search.glade mail-security.glade MARSHAL_GENERATED = em-marshal.c em-marshal.h @EVO_MARSHAL_RULE@ @@ -211,8 +239,11 @@ EXTRA_DIST = \ $(glade_DATA) \ $(schema_DATA) \ $(server_in_files) \ - $(etspec_DATA) - + $(etspec_DATA) \ + filtertypes.xml \ + vfoldertypes.xml \ + searchtypes.xml \ + em-filter-i18n.h # Purify support -- cgit v1.2.3