Move EAlert* and e-xml-utils references from other part of the code to libevolution-utils.

18 files changed, 21 insertions, 21 deletions

diff --git a/mail/e-mail-account-store.c b/mail/e-mail-account-store.c
index c14f75e4e5..f22160cab8 100644
--- a/mail/e-mail-account-store.c
+++ b/mail/e-mail-account-store.c
@@ -25,7 +25,7 @@
 #include <libebackend/e-extensible.h>
 
 #include <e-util/e-marshal.h>
-#include <e-util/e-alert-dialog.h>
+#include <libevolution-utils/e-alert-dialog.h>
 
 #include <libemail-utils/e-account-utils.h>
 #include <libemail-engine/mail-ops.h>
diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c
index f2e8fb9962..75866f3d3c 100644
--- a/mail/e-mail-backend.c
+++ b/mail/e-mail-backend.c
@@ -35,8 +35,8 @@
 
 #include <shell/e-shell.h>
 
-#include <e-util/e-alert-dialog.h>
-#include <e-util/e-alert-sink.h>
+#include <libevolution-utils/e-alert-dialog.h>
+#include <libevolution-utils/e-alert-sink.h>
 
 #include <misc/e-account-combo-box.h>
 
diff --git a/mail/e-mail-migrate.c b/mail/e-mail-migrate.c
index 0d2381ffa0..b54a764ca2 100644
--- a/mail/e-mail-migrate.c
+++ b/mail/e-mail-migrate.c
@@ -55,9 +55,9 @@
 #include <shell/e-shell-migrate.h>
 
 #include <e-util/e-util.h>
-#include <e-util/e-xml-utils.h>
+#include <libevolution-utils/e-xml-utils.h>
 
-#include <e-util/e-alert-dialog.h>
+#include <libevolution-utils/e-alert-dialog.h>
 #include <e-util/e-util-private.h>
 #include <e-util/e-plugin.h>
 
diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c
index 0981fb327b..bba721eaf6 100644
--- a/mail/e-mail-reader-utils.c
+++ b/mail/e-mail-reader-utils.c
@@ -32,7 +32,7 @@
 #include <gtkhtml/gtkhtml.h>
 #include <camel/camel.h>
 
-#include "e-util/e-alert-dialog.h"
+#include "libevolution-utils/e-alert-dialog.h"
 #include "filter/e-filter-rule.h"
 #include "misc/e-web-view.h"
 #include "shell/e-shell-utils.h"
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index 132ee43259..c7e2c077a8 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -34,7 +34,7 @@
 
 #include "e-util/e-charset.h"
 #include "e-util/e-util.h"
-#include "e-util/e-alert-dialog.h"
+#include "libevolution-utils/e-alert-dialog.h"
 #include "shell/e-shell-utils.h"
 #include "widgets/misc/e-popup-action.h"
 #include "widgets/misc/e-menu-tool-action.h"
diff --git a/mail/e-mail-reader.h b/mail/e-mail-reader.h
index 3ac0a5c6eb..233e52b1f9 100644
--- a/mail/e-mail-reader.h
+++ b/mail/e-mail-reader.h
@@ -29,7 +29,7 @@
 
 #include <gtk/gtk.h>
 #include <camel/camel.h>
-#include <e-util/e-alert-sink.h>
+#include <libevolution-utils/e-alert-sink.h>
 #include <mail/e-mail-backend.h>
 #include <mail/em-format-html.h>
 #include <misc/e-preview-pane.h>
diff --git a/mail/e-mail-ui-session.c b/mail/e-mail-ui-session.c
index 1d32cc74a7..90c13492c9 100644
--- a/mail/e-mail-ui-session.c
+++ b/mail/e-mail-ui-session.c
@@ -51,7 +51,7 @@
 
 #include "e-util/e-util.h"
 #include "libemail-utils/e-account-utils.h"
-#include "e-util/e-alert-dialog.h"
+#include "libevolution-utils/e-alert-dialog.h"
 #include "e-util/e-util-private.h"
 
 #include "shell/e-shell.h"
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index 3e783bb35a..d9aa637f24 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -48,7 +48,7 @@
 #include <shell/e-shell.h>
 
 #include <e-util/e-util.h>
-#include <e-util/e-alert-dialog.h>
+#include <libevolution-utils/e-alert-dialog.h>
 #include <e-util/e-dialog-utils.h>
 #include <e-util/e-util-private.h>
 
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 2c296280f2..745609fbc0 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -32,8 +32,8 @@
 
 #include <libedataserver/e-data-server-util.h>
 
-#include <e-util/e-alert-dialog.h>
-#include <e-util/e-alert-sink.h>
+#include <libevolution-utils/e-alert-dialog.h>
+#include <libevolution-utils/e-alert-sink.h>
 #include <e-util/e-util.h>
 
 #include <libemail-utils/e-account-utils.h>
diff --git a/mail/em-filter-folder-element.c b/mail/em-filter-folder-element.c
index b49dc8907a..7b88991d92 100644
--- a/mail/em-filter-folder-element.c
+++ b/mail/em-filter-folder-element.c
@@ -36,7 +36,7 @@
 #include "mail/em-utils.h"
 #include "shell/e-shell.h"
 #include "filter/e-filter-part.h"
-#include "e-util/e-alert.h"
+#include "libevolution-utils/e-alert.h"
 
 #define EM_FILTER_FOLDER_ELEMENT_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/mail/em-folder-properties.h b/mail/em-folder-properties.h
index 2d829af17f..a94354dba8 100644
--- a/mail/em-folder-properties.h
+++ b/mail/em-folder-properties.h
@@ -25,7 +25,7 @@
 #define __EM_FOLDER_PROPERTIES_H__
 
 #include <camel/camel.h>
-#include <e-util/e-alert-sink.h>
+#include <libevolution-utils/e-alert-sink.h>
 #include <libemail-engine/e-mail-session.h>
 
 G_BEGIN_DECLS
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 43b0e246f1..2a6f0b5b25 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -41,7 +41,7 @@
 
 #include "e-util/e-mktemp.h"
 #include "e-util/e-icon-factory.h"
-#include "e-util/e-alert-dialog.h"
+#include "libevolution-utils/e-alert-dialog.h"
 #include "e-util/e-util.h"
 
 #include "misc/e-selectable.h"
diff --git a/mail/em-folder-tree.h b/mail/em-folder-tree.h
index 1e39ebab18..5e893e687a 100644
--- a/mail/em-folder-tree.h
+++ b/mail/em-folder-tree.h
@@ -26,7 +26,7 @@
 
 #include <gtk/gtk.h>
 #include <e-util/e-activity.h>
-#include <e-util/e-alert-sink.h>
+#include <libevolution-utils/e-alert-sink.h>
 #include <mail/em-folder-tree-model.h>
 #include <libemail-engine/e-mail-session.h>
 
diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c
index d1a5866de6..3ffdd6c859 100644
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@ -41,7 +41,7 @@
 
 #include "e-util/e-mktemp.h"
 
-#include "e-util/e-alert-dialog.h"
+#include "libevolution-utils/e-alert-dialog.h"
 #include "e-util/e-dialog-utils.h"
 
 #include "em-vfolder-rule.h"
diff --git a/mail/em-utils.c b/mail/em-utils.c
index c712431aa8..f30a26fc8e 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -57,7 +57,7 @@
 #include <e-util/e-util-private.h>
 #include <e-util/e-mktemp.h>
 #include <e-util/e-dialog-utils.h>
-#include <e-util/e-alert-dialog.h>
+#include <libevolution-utils/e-alert-dialog.h>
 
 #include <shell/e-shell.h>
 #include <widgets/misc/e-attachment.h>
diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c
index c45f3d02e7..adea1b92f0 100644
--- a/mail/em-vfolder-rule.c
+++ b/mail/em-vfolder-rule.c
@@ -33,7 +33,7 @@
 #include <shell/e-shell.h>
 
 #include <e-util/e-util.h>
-#include <e-util/e-alert.h>
+#include <libevolution-utils/e-alert.h>
 #include <e-util/e-util-private.h>
 
 #include <libemail-engine/e-mail-folder-utils.h>
diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c
index 9a8671063a..597c87d9d3 100644
--- a/mail/mail-autofilter.c
+++ b/mail/mail-autofilter.c
@@ -35,7 +35,7 @@
 #include "mail-vfolder.h"
 #include "mail-autofilter.h"
 #include "em-utils.h"
-#include "e-util/e-alert-dialog.h"
+#include "libevolution-utils/e-alert-dialog.h"
 #include "e-util/e-util-private.h"
 
 #include "em-vfolder-context.h"
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index cc7407f4f8..a9fd42e5db 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -28,7 +28,7 @@
 
 #include <glib/gi18n.h>
 
-#include "e-util/e-alert-dialog.h"
+#include "libevolution-utils/e-alert-dialog.h"
 #include "e-util/e-util-private.h"
 
 #include "libemail-utils/mail-mt.h"