18 files changed, 21 insertions, 18 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 0b52e672e2..257eff73f0 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-16  Not Zed  <NotZed@Ximian.com>
+
+	* move e-error into e-util/
+
 2005-05-16  Srinivasa Ragavan <sragavan@novell.com>
 
 	* GNOME_Evolution_Mail.server.in.in: Added tooltips
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index 390f092148..f9b417109f 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -70,7 +70,7 @@
 #include <e-util/e-account-list.h>
 #include <e-util/e-signature-list.h>
 
-#include <widgets/misc/e-error.h>
+#include "e-util/e-error.h"
 
 #include "em-config.h"
 #include "em-folder-selection-button.h"
diff --git a/mail/em-account-prefs.c b/mail/em-account-prefs.c
index 0649698bf0..0378bc769e 100644
--- a/mail/em-account-prefs.c
+++ b/mail/em-account-prefs.c
@@ -41,7 +41,7 @@
 #include "mail-send-recv.h"
 
 #include "e-util/e-account-list.h"
-#include "widgets/misc/e-error.h"
+#include "e-util/e-error.h"
 
 #include "em-account-prefs.h"
 
diff --git a/mail/em-composer-prefs.c b/mail/em-composer-prefs.c
index 7a3cd88beb..de1cbd57fb 100644
--- a/mail/em-composer-prefs.c
+++ b/mail/em-composer-prefs.c
@@ -60,7 +60,7 @@
 #include <gtkhtml/gtkhtml.h>
 
 #include "widgets/misc/e-charset-picker.h"
-#include "widgets/misc/e-error.h"
+#include "e-util/e-error.h"
 
 #include <e-util/e-icon-factory.h>
 
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 7007a318bb..38bcb99a4b 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -38,7 +38,7 @@
 #include "mail-send-recv.h"
 #include "mail-component.h"
 
-#include "widgets/misc/e-error.h"
+#include "e-util/e-error.h"
 
 #include "em-utils.h"
 #include "em-composer-utils.h"
diff --git a/mail/em-filter-folder-element.c b/mail/em-filter-folder-element.c
index 5a985de62c..e2f0b81b9f 100644
--- a/mail/em-filter-folder-element.c
+++ b/mail/em-filter-folder-element.c
@@ -34,7 +34,7 @@
 #include "mail/mail-component.h"
 #include "mail/em-utils.h"
 #include "libedataserver/e-sexp.h"
-#include "widgets/misc/e-error.h"
+#include "e-util/e-error.h"
 
 #define d(x)
 
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index c584f1f138..ed96710a99 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -51,8 +51,7 @@
 #include "e-util/e-mktemp.h"
 #include "e-util/e-request.h"
 #include "e-util/e-icon-factory.h"
-
-#include "widgets/misc/e-error.h"
+#include "e-util/e-error.h"
 
 #include "em-vfolder-rule.h"
 
diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c
index 1e836fa661..32ebb59a73 100644
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@ -52,7 +52,7 @@
 #include "e-util/e-request.h"
 #include "e-util/e-icon-factory.h"
 
-#include "widgets/misc/e-error.h"
+#include "e-util/e-error.h"
 
 #include "em-vfolder-rule.h"
 
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index 2ba14951a4..4ee979fb0e 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -64,7 +64,7 @@
 #include <bonobo/bonobo-ui-util.h>
 
 #include "widgets/misc/e-charset-picker.h"
-#include "widgets/misc/e-error.h"
+#include "e-util/e-error.h"
 
 #include <e-util/e-dialog-utils.h>
 #include <e-util/e-icon-factory.h>
diff --git a/mail/em-migrate.c b/mail/em-migrate.c
index c767e2fa05..94db5d7325 100644
--- a/mail/em-migrate.c
+++ b/mail/em-migrate.c
@@ -60,7 +60,7 @@
 #include "e-util/e-bconf-map.h"
 #include "e-util/e-account-list.h"
 #include "e-util/e-signature-list.h"
-#include "widgets/misc/e-error.h"
+#include "e-util/e-error.h"
 
 #include "mail-config.h"
 #include "em-utils.h"
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 22b0ea1dda..3f05696302 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -56,7 +56,7 @@
 #include <e-util/e-mktemp.h>
 #include <e-util/e-account-list.h>
 #include <e-util/e-dialog-utils.h>
-#include "widgets/misc/e-error.h"
+#include "e-util/e-error.h"
 
 #include <gal/util/e-util.h>
 
diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c
index ceafc56b2a..dc7e75ce24 100644
--- a/mail/em-vfolder-rule.c
+++ b/mail/em-vfolder-rule.c
@@ -37,7 +37,7 @@
 #include "mail/em-folder-tree.h"
 #include "mail/em-folder-selector.h"
 #include "mail/mail-component.h"
-#include "widgets/misc/e-error.h"
+#include "e-util/e-error.h"
 
 #define d(x)
 
diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c
index a1f7728d78..ec24257183 100644
--- a/mail/mail-autofilter.c
+++ b/mail/mail-autofilter.c
@@ -41,7 +41,7 @@
 #include "mail-autofilter.h"
 #include "mail-component.h"
 #include "em-utils.h"
-#include "widgets/misc/e-error.h"
+#include "e-util/e-error.h"
 
 #include "em-vfolder-context.h"
 #include "em-vfolder-rule.h"
diff --git a/mail/mail-component.c b/mail/mail-component.c
index 34713baeab..c37991625c 100644
--- a/mail/mail-component.c
+++ b/mail/mail-component.c
@@ -46,7 +46,7 @@
 #include "em-migrate.h"
 
 #include "widgets/misc/e-info-label.h"
-#include "widgets/misc/e-error.h"
+#include "e-util/e-error.h"
 
 #include "em-search-context.h"
 #include "mail-config.h"
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index 7baa6aef33..bd2990bf6b 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -19,7 +19,7 @@
 #include <gal/widgets/e-gui-utils.h>
 
 #include "libedataserver/e-msgport.h"
-#include "widgets/misc/e-error.h"
+#include "e-util/e-error.h"
 
 #include "e-activity-handler.h"
 #include <e-util/e-icon-factory.h>
diff --git a/mail/mail-session.c b/mail/mail-session.c
index 627447c3f7..ae971c5817 100644
--- a/mail/mail-session.c
+++ b/mail/mail-session.c
@@ -55,7 +55,7 @@
 #include <libedataserverui/e-passwords.h>
 #include "libedataserver/e-msgport.h"
 #include "em-junk-filter.h"
-#include "widgets/misc/e-error.h"
+#include "e-util/e-error.h"
 
 #define d(x)
 
diff --git a/mail/mail-signature-editor.c b/mail/mail-signature-editor.c
index 0ffff0fcd5..b34644676e 100644
--- a/mail/mail-signature-editor.c
+++ b/mail/mail-signature-editor.c
@@ -37,7 +37,7 @@
 #include <bonobo/bonobo-stream-memory.h>
 
 #include <e-util/e-signature-list.h>
-#include "widgets/misc/e-error.h"
+#include "e-util/e-error.h"
 
 #include "e-msg-composer.h"
 #include "mail-signature-editor.h"
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index d575d5f793..b50626a59e 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -39,7 +39,7 @@
 #include "em-utils.h"
 
 #include "e-util/e-account-list.h"
-#include "widgets/misc/e-error.h"
+#include "e-util/e-error.h"
 
 #include "camel/camel-vee-folder.h"
 #include "camel/camel-vee-store.h"