[evolution/mail-mt-cleanup: 7/7] Remove last dependency on filter stuff from mail backend

[Jonathon Jongsma <jjongsma src gnome org>]

commit 78ebd64b16dc027e5032343efc3ce7e80b553da6
Author: Jonathon Jongsma <jonathon quotidian org>
Date:   Mon Jan 11 10:56:21 2010 -0600

    Remove last dependency on filter stuff from mail backend
    
    Moved the filter source #defines from e-filter-rule.h to e-util.h so that we
    don't need to depend on the filter classes from mail-ops.c, etc.

 e-util/e-util.h            |    6 ++++++
 filter/e-filter-rule.h     |    6 ------
 mail/e-mail-reader-utils.c |    2 +-
 mail/mail-ops.c            |    2 +-
 mail/mail-send-recv.c      |    2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/e-util/e-util.h b/e-util/e-util.h
index 01c16fb..f45040a 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -37,6 +37,12 @@
 
 #include <e-util/e-marshal.h>
 
+#define E_FILTER_SOURCE_INCOMING "incoming" /* performed on incoming email */
+#define E_FILTER_SOURCE_DEMAND   "demand"   /* performed on the selected folder
+					     * when the user asks for it */
+#define E_FILTER_SOURCE_OUTGOING  "outgoing"/* performed on outgoing mail */
+#define E_FILTER_SOURCE_JUNKTEST  "junktest"/* perform only junktest on incoming mail */
+
 /* Convenience macro to help migrate from libglade to GtkBuilder.
  * Use it as a direct replacement for glade_xml_get_widget(). */
 #define e_builder_get_widget(builder, name) \
diff --git a/filter/e-filter-rule.h b/filter/e-filter-rule.h
index 924fb14..b81c7ec 100644
--- a/filter/e-filter-rule.h
+++ b/filter/e-filter-rule.h
@@ -69,12 +69,6 @@ enum _filter_threading_t {
 	E_FILTER_THREAD_SINGLE	/* messages with no replies or parents */
 };
 
-#define E_FILTER_SOURCE_INCOMING "incoming" /* performed on incoming email */
-#define E_FILTER_SOURCE_DEMAND   "demand"   /* performed on the selected folder
-					     * when the user asks for it */
-#define E_FILTER_SOURCE_OUTGOING  "outgoing"/* performed on outgoing mail */
-#define E_FILTER_SOURCE_JUNKTEST  "junktest"/* perform only junktest on incoming mail */
-
 struct _EFilterRule {
 	GObject parent_object;
 	EFilterRulePrivate *priv;
diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c
index cf86d32..daff2ad 100644
--- a/mail/e-mail-reader-utils.c
+++ b/mail/e-mail-reader-utils.c
@@ -30,7 +30,7 @@
 #include <camel/camel-vee-store.h>
 
 #include "e-util/e-alert-dialog.h"
-#include "filter/e-filter-rule.h"
+#include "e-util/e-util.h"
 
 #include "e-mail-browser.h"
 #include "e-mail-task-manager.h"
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 5244cf2..d5b5004 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -49,10 +49,10 @@
 
 #include <libedataserver/e-data-server-util.h>
 #include "e-util/e-account-utils.h"
+#include "e-util/e-util.h"
 
 #include "e-mail-local.h"
 #include "e-mail-task-manager.h"
-#include "em-filter-rule.h"
 #include "mail-mt.h"
 #include "mail-ops.h"
 #include "mail-session.h"
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 82f4acd..4fea687 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -38,12 +38,12 @@
 
 #include "shell/e-shell.h"
 #include "e-util/e-account-utils.h"
+#include "e-util/e-util.h"
 #include "e-util/gconf-bridge.h"
 
 #include "e-mail-local.h"
 #include "e-mail-task-manager.h"
 #include "em-event.h"
-#include "em-filter-rule.h"
 #include "mail-config.h"
 #include "mail-folder-cache.h"
 #include "mail-mt.h"