** 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, 3 insertions, 3 deletions

diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 17e4fa5f8c..e524b17df8 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -53,7 +53,7 @@
 
 #include "widgets/misc/e-error.h"
 
-#include "filter/vfolder-rule.h"
+#include "em-vfolder-rule.h"
 
 #include "mail-mt.h"
 #include "mail-ops.h"
@@ -2285,9 +2285,9 @@ emft_popup_new_folder_response (EMFolderSelector *emfs, int response, EMFolderTr
 
 	/* HACK: we need to create vfolders using the vfolder editor */
 	if (CAMEL_IS_VEE_STORE(store)) {
-		VfolderRule *rule;
+		EMVFolderRule *rule;
 
-		rule = vfolder_rule_new();
+		rule = em_vfolder_rule_new();
 		filter_rule_set_name((FilterRule *)rule, path);
 		vfolder_gui_add_rule(rule);
 		gtk_widget_destroy((GtkWidget *)emfs);