** See #59885.

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

        ** 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

1 files changed, 17 insertions, 0 deletions

diff --git a/mail/mail-errors.xml b/mail/mail-errors.xml
index 0a9996dc8b..5190fbf9ad 100644
--- a/mail/mail-errors.xml
+++ b/mail/mail-errors.xml
@@ -282,6 +282,23 @@ Used the now removed folder:
 And have been updated.</secondary>
  </error>
 
+ <error id="no-folder" type="error">
+  <primary>Missing folder.</primary>
+  <secondary>You must specify a folder.</secondary>
+ </error>
+
+ <error id="no-name-vfolder" type="error">
+  <primary>Missing name.</primary>
+  <secondary>You must name this vFolder.</secondary>
+ </error>
+
+ <error id="vfolder-no-source" type="error">
+  <primary>No sources selected.</primary>
+  <secondary>You must specify at least one folder as a source.
+Either by selecting the folders individually, and/or by selecting
+all local folders, all remote folders, or both.</secondary>
+ </error>
+
  <error id="ask-migrate-existing" type="question" default="GTK_RESPONSE_CANCEL">
   <primary>Problem migrating old mail folder &quot;{0}&quot;.</primary>
   <secondary>A non-empty folder at &quot;{1}&quot; already exists.