GNOME.org
 

[evolution/vfolder-prep: 5/7] Move EAlert* and e-xml-utils references from other part of the code to libevolution-utils.

commit adcac236f27c1d58f4ca3a40acd79e5299da5959
Author: Srinivasa Ragavan <sragavan gnome org>
Date:   Wed Feb 29 17:41:30 2012 +0530

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

 addressbook/gui/contact-editor/e-contact-editor.c  |    2 +-
 .../gui/contact-editor/e-contact-quick-add.c       |    2 +-
 .../contact-list-editor/e-contact-list-editor.c    |    2 +-
 .../gui/contact-list-editor/e-contact-list-model.c |    2 +-
 addressbook/gui/widgets/e-addressbook-view.c       |    2 +-
 addressbook/gui/widgets/eab-gui-util.c             |    2 +-
 addressbook/gui/widgets/eab-gui-util.h             |    2 +-
 addressbook/gui/widgets/gal-view-minicard.c        |    2 +-
 calendar/gui/dialogs/cancel-comp.c                 |    2 +-
 calendar/gui/dialogs/comp-editor.c                 |    4 ++--
 calendar/gui/dialogs/delete-comp.c                 |    2 +-
 calendar/gui/dialogs/save-comp.c                   |    2 +-
 calendar/gui/dialogs/send-comp.c                   |    2 +-
 calendar/gui/e-calendar-view.c                     |    2 +-
 calendar/gui/gnome-cal.c                           |    2 +-
 composer/e-composer-actions.c                      |    2 +-
 composer/e-composer-private.h                      |    2 +-
 composer/e-msg-composer.c                          |    2 +-
 e-util/e-activity.h                                |    2 +-
 e-util/e-util.h                                    |    2 +-
 filter/e-filter-datespec.c                         |    2 +-
 filter/e-filter-element.h                          |    2 +-
 filter/e-filter-file.c                             |    2 +-
 filter/e-filter-input.c                            |    2 +-
 filter/e-filter-part.h                             |    2 +-
 filter/e-filter-rule.c                             |    2 +-
 filter/e-rule-context.c                            |    4 ++--
 filter/e-rule-editor.c                             |    2 +-
 libevolution-utils/e-alert-sink.c                  |    2 +-
 mail/e-mail-account-store.c                        |    2 +-
 mail/e-mail-backend.c                              |    4 ++--
 mail/e-mail-migrate.c                              |    4 ++--
 mail/e-mail-reader-utils.c                         |    2 +-
 mail/e-mail-reader.c                               |    2 +-
 mail/e-mail-reader.h                               |    2 +-
 mail/e-mail-ui-session.c                           |    2 +-
 mail/em-account-editor.c                           |    2 +-
 mail/em-composer-utils.c                           |    4 ++--
 mail/em-filter-folder-element.c                    |    2 +-
 mail/em-folder-properties.h                        |    2 +-
 mail/em-folder-tree.c                              |    2 +-
 mail/em-folder-tree.h                              |    2 +-
 mail/em-folder-utils.c                             |    2 +-
 mail/em-utils.c                                    |    2 +-
 mail/em-vfolder-rule.c                             |    2 +-
 mail/mail-autofilter.c                             |    2 +-
 mail/mail-vfolder.c                                |    2 +-
 modules/addressbook/addressbook-config.c           |    2 +-
 modules/addressbook/e-book-shell-migrate.c         |    2 +-
 modules/addressbook/e-book-shell-view-actions.c    |    2 +-
 modules/calendar/e-cal-shell-sidebar.c             |    2 +-
 modules/calendar/e-cal-shell-view-actions.c        |    2 +-
 modules/calendar/e-memo-shell-sidebar.c            |    2 +-
 modules/calendar/e-memo-shell-view-actions.c       |    2 +-
 modules/calendar/e-task-shell-sidebar.c            |    2 +-
 modules/calendar/e-task-shell-view-actions.c       |    2 +-
 modules/composer-autosave/e-composer-autosave.c    |    2 +-
 modules/composer-autosave/e-composer-registry.c    |    2 +-
 modules/mail/e-mail-attachment-handler.c           |    2 +-
 modules/mail/em-account-prefs.c                    |    2 +-
 modules/mdn/evolution-mdn.c                        |    2 +-
 modules/offline-alert/evolution-offline-alert.c    |    2 +-
 modules/startup-wizard/evolution-startup-wizard.c  |    2 +-
 plugins/attachment-reminder/attachment-reminder.c  |    2 +-
 plugins/backup-restore/backup-restore.c            |    2 +-
 plugins/bbdb/gaimbuddies.c                         |    2 +-
 plugins/external-editor/external-editor.c          |    2 +-
 plugins/face/face.c                                |    2 +-
 plugins/itip-formatter/itip-formatter.c            |    2 +-
 .../mailing-list-actions/mailing-list-actions.c    |    2 +-
 plugins/save-calendar/save-calendar.c              |    2 +-
 plugins/templates/templates.c                      |    2 +-
 shell/e-shell-content.c                            |    4 ++--
 shell/e-shell-migrate.c                            |    2 +-
 shell/e-shell-sidebar.c                            |    2 +-
 shell/e-shell-window-private.h                     |    4 ++--
 shell/e-shell.h                                    |    2 +-
 widgets/menus/gal-view-collection.c                |    2 +-
 widgets/menus/gal-view-instance.c                  |    2 +-
 widgets/misc/e-alert-bar.h                         |    2 +-
 widgets/misc/e-preview-pane.c                      |    4 ++--
 widgets/misc/e-signature-editor.c                  |    4 ++--
 widgets/misc/e-web-view.c                          |    4 ++--
 widgets/table/e-table-column-specification.c       |    2 +-
 widgets/table/e-table-field-chooser-item.c         |    2 +-
 widgets/table/e-table-header-item.c                |    2 +-
 widgets/table/e-table-memory.c                     |    2 +-
 widgets/table/e-table-sort-info.c                  |    2 +-
 widgets/table/e-table-specification.c              |    2 +-
 widgets/table/e-table-state.c                      |    2 +-
 widgets/table/e-tree-memory.c                      |    2 +-
 widgets/table/e-tree-model.c                       |    2 +-
 widgets/table/e-tree-sorted.c                      |    2 +-
 widgets/table/e-tree-table-adapter.c               |    2 +-
 94 files changed, 104 insertions(+), 104 deletions(-)
---
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 3189632..0022c4b 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -43,7 +43,7 @@
 #include "addressbook/printing/e-contact-print.h"
 #include "addressbook/gui/widgets/eab-gui-util.h"
 #include "e-util/e-util.h"
-#include "e-util/e-alert-dialog.h"
+#include "libevolution-utils/e-alert-dialog.h"
 #include "misc/e-dateedit.h"
 #include "misc/e-image-chooser.h"
 #include "misc/e-url-entry.h"
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c
index 3ec9430..7c303e7 100644
--- a/addressbook/gui/contact-editor/e-contact-quick-add.c
+++ b/addressbook/gui/contact-editor/e-contact-quick-add.c
@@ -36,7 +36,7 @@
 #include "e-contact-editor.h"
 #include "e-contact-quick-add.h"
 #include "eab-contact-merging.h"
-#include "e-util/e-alert-dialog.h"
+#include "libevolution-utils/e-alert-dialog.h"
 
 typedef struct _QuickAdd QuickAdd;
 struct _QuickAdd {
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
index 42099d1..3db6c4c 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
@@ -26,7 +26,7 @@
 
 #include "e-contact-list-editor.h"
 #include <e-util/e-util-private.h>
-#include <e-util/e-alert-dialog.h>
+#include <libevolution-utils/e-alert-dialog.h>
 #include <e-util/e-selection.h>
 #include "shell/e-shell.h"
 
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-model.c b/addressbook/gui/contact-list-editor/e-contact-list-model.c
index c81beee..bba9681 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-model.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-model.c
@@ -26,7 +26,7 @@
 #include <string.h>
 
 #include "e-contact-list-model.h"
-#include "e-util/e-alert-dialog.h"
+#include "libevolution-utils/e-alert-dialog.h"
 #include "shell/e-shell.h"
 
 #define E_CONTACT_LIST_MODEL_GET_PRIVATE(obj) \
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index 1212cc6..50f50c9 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -54,7 +54,7 @@
 #include "e-addressbook-table-adapter.h"
 #include "eab-contact-merging.h"
 
-#include "e-util/e-alert-dialog.h"
+#include "libevolution-utils/e-alert-dialog.h"
 #include "e-util/e-util-private.h"
 
 #include <gdk/gdkkeysyms.h>
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c
index 12c08d0..b1c8cdc 100644
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ b/addressbook/gui/widgets/eab-gui-util.c
@@ -41,7 +41,7 @@
 #include <e-util/e-util.h>
 #include "eab-gui-util.h"
 #include "util/eab-book-util.h"
-#include "e-util/e-alert-dialog.h"
+#include "libevolution-utils/e-alert-dialog.h"
 #include "e-util/e-html-utils.h"
 #include "shell/e-shell.h"
 #include "misc/e-image-chooser.h"
diff --git a/addressbook/gui/widgets/eab-gui-util.h b/addressbook/gui/widgets/eab-gui-util.h
index 88a759b..7844094 100644
--- a/addressbook/gui/widgets/eab-gui-util.h
+++ b/addressbook/gui/widgets/eab-gui-util.h
@@ -26,7 +26,7 @@
 
 #include <gtk/gtk.h>
 #include <libebook/e-book-client.h>
-#include "e-util/e-alert-sink.h"
+#include "libevolution-utils/e-alert-sink.h"
 
 G_BEGIN_DECLS
 
diff --git a/addressbook/gui/widgets/gal-view-minicard.c b/addressbook/gui/widgets/gal-view-minicard.c
index 277866a..b74f4fb 100644
--- a/addressbook/gui/widgets/gal-view-minicard.c
+++ b/addressbook/gui/widgets/gal-view-minicard.c
@@ -28,7 +28,7 @@
 #endif
 
 #include <libxml/parser.h>
-#include <e-util/e-xml-utils.h>
+#include <libevolution-utils/e-xml-utils.h>
 #include <libedataserver/e-xml-utils.h>
 
 #include "gal-view-minicard.h"
diff --git a/calendar/gui/dialogs/cancel-comp.c b/calendar/gui/dialogs/cancel-comp.c
index 1bb37ac..5dbdb0e 100644
--- a/calendar/gui/dialogs/cancel-comp.c
+++ b/calendar/gui/dialogs/cancel-comp.c
@@ -28,7 +28,7 @@
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include "e-util/e-alert-dialog.h"
+#include "libevolution-utils/e-alert-dialog.h"
 #include "cancel-comp.h"
 
 /* is_past_event:
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index f148f1e..641666b 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -38,7 +38,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <libebackend/e-extensible.h>
 #include <e-util/e-util.h>
-#include <e-util/e-alert-sink.h>
+#include <libevolution-utils/e-alert-sink.h>
 #include <e-util/e-dialog-utils.h>
 #include <e-util/e-util-private.h>
 #include <shell/e-shell.h>
@@ -61,7 +61,7 @@
 #include "widgets/misc/e-attachment-view.h"
 #include "widgets/misc/e-attachment-paned.h"
 
-#include "e-util/e-alert-dialog.h"
+#include "libevolution-utils/e-alert-dialog.h"
 #include "e-util/e-ui-manager.h"
 
 #define COMP_EDITOR_GET_PRIVATE(obj) \
diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c
index 4ad1bf7..d082551 100644
--- a/calendar/gui/dialogs/delete-comp.c
+++ b/calendar/gui/dialogs/delete-comp.c
@@ -27,7 +27,7 @@
 #endif
 
 #include <glib/gi18n.h>
-#include "e-util/e-alert-dialog.h"
+#include "libevolution-utils/e-alert-dialog.h"
 #include "delete-comp.h"
 
 /**
diff --git a/calendar/gui/dialogs/save-comp.c b/calendar/gui/dialogs/save-comp.c
index 459ff9a..2fd53bd 100644
--- a/calendar/gui/dialogs/save-comp.c
+++ b/calendar/gui/dialogs/save-comp.c
@@ -25,7 +25,7 @@
 #include <config.h>
 #endif
 
-#include "e-util/e-alert-dialog.h"
+#include "libevolution-utils/e-alert-dialog.h"
 #include "save-comp.h"
 #include "comp-editor.h"
 
diff --git a/calendar/gui/dialogs/send-comp.c b/calendar/gui/dialogs/send-comp.c
index 4e5e166..5f11665 100644
--- a/calendar/gui/dialogs/send-comp.c
+++ b/calendar/gui/dialogs/send-comp.c
@@ -27,7 +27,7 @@
 #endif
 
 #include <glib/gi18n-lib.h>
-#include "e-util/e-alert-dialog.h"
+#include "libevolution-utils/e-alert-dialog.h"
 #include "send-comp.h"
 
 static gboolean
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 1788e96..dd22c5d 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -34,7 +34,7 @@
 #include <libedataserver/e-time-utils.h>
 #include <libedataserverui/e-client-utils.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-selection.h>
 #include <e-util/e-datetime-format.h>
 #include <e-util/e-dialog-utils.h>
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index ecfb116..fd807fd 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -46,7 +46,7 @@
 #include <widgets/menus/gal-view-etable.h>
 #include <widgets/menus/gal-define-views-dialog.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-util-private.h"
 #include "shell/e-shell.h"
 #include "dialogs/delete-error.h"
diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c
index cd50f7a..11ad9cd 100644
--- a/composer/e-composer-actions.c
+++ b/composer/e-composer-actions.c
@@ -25,7 +25,7 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <e-util/e-alert-dialog.h>
+#include <libevolution-utils/e-alert-dialog.h>
 
 static void
 action_attach_cb (GtkAction *action,
diff --git a/composer/e-composer-private.h b/composer/e-composer-private.h
index 4282d57..a727cf6 100644
--- a/composer/e-composer-private.h
+++ b/composer/e-composer-private.h
@@ -35,7 +35,7 @@
 #include "e-composer-actions.h"
 #include "e-composer-activity.h"
 #include "e-composer-header-table.h"
-#include "e-util/e-alert-sink.h"
+#include "libevolution-utils/e-alert-sink.h"
 #include "e-util/e-charset.h"
 #include "e-util/e-marshal.h"
 #include "e-util/e-mktemp.h"
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 9f32d8c..70f6dca 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -37,7 +37,7 @@
 #include <ctype.h>
 #include <fcntl.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>
 #include <em-format/em-format.h>
diff --git a/e-util/e-activity.h b/e-util/e-activity.h
index 3e56f99..4cc9951 100644
--- a/e-util/e-activity.h
+++ b/e-util/e-activity.h
@@ -23,7 +23,7 @@
 #define E_ACTIVITY_H
 
 #include <gtk/gtk.h>
-#include <e-util/e-alert-sink.h>
+#include <libevolution-utils/e-alert-sink.h>
 #include <e-util/e-util-enums.h>
 
 /* Standard GObject macros */
diff --git a/e-util/e-util.h b/e-util/e-util.h
index ea2ccbe..1bca2ea 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -28,7 +28,7 @@
 #include <limits.h>
 #include <gconf/gconf-client.h>
 
-#include <libevolution-util/evolution-util.h>
+#include <libevolution-utils/evolution-util.h>
 #include <e-util/e-marshal.h>
 #include <e-util/e-util-enums.h>
 
diff --git a/filter/e-filter-datespec.c b/filter/e-filter-datespec.c
index 4f7b659..c1959bf 100644
--- a/filter/e-filter-datespec.c
+++ b/filter/e-filter-datespec.c
@@ -33,7 +33,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include "e-util/e-alert.h"
+#include "libevolution-utils/e-alert.h"
 #include "e-util/e-util.h"
 #include "e-util/e-util-private.h"
 
diff --git a/filter/e-filter-element.h b/filter/e-filter-element.h
index c0bcadd..694efa2 100644
--- a/filter/e-filter-element.h
+++ b/filter/e-filter-element.h
@@ -28,7 +28,7 @@
 #include <camel/camel.h>
 #include <libxml/parser.h>
 #include <libxml/xmlmemory.h>
-#include <e-util/e-alert.h>
+#include <libevolution-utils/e-alert.h>
 
 #define E_TYPE_FILTER_ELEMENT \
 	(e_filter_element_get_type ())
diff --git a/filter/e-filter-file.c b/filter/e-filter-file.c
index baf75e7..cb84e98 100644
--- a/filter/e-filter-file.c
+++ b/filter/e-filter-file.c
@@ -31,7 +31,7 @@
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
-#include "e-util/e-alert.h"
+#include "libevolution-utils/e-alert.h"
 
 #include "e-filter-file.h"
 #include "e-filter-part.h"
diff --git a/filter/e-filter-input.c b/filter/e-filter-input.c
index 8b92f54..e81ae4c 100644
--- a/filter/e-filter-input.c
+++ b/filter/e-filter-input.c
@@ -32,7 +32,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include "e-util/e-alert.h"
+#include "libevolution-utils/e-alert.h"
 
 #include "e-filter-input.h"
 
diff --git a/filter/e-filter-part.h b/filter/e-filter-part.h
index dcf1e8b..da377f3 100644
--- a/filter/e-filter-part.h
+++ b/filter/e-filter-part.h
@@ -27,7 +27,7 @@
 #include <gtk/gtk.h>
 #include <libxml/parser.h>
 #include <libxml/xmlmemory.h>
-#include "e-util/e-alert.h"
+#include "libevolution-utils/e-alert.h"
 #include "e-filter-element.h"
 
 /* Standard GObject macros */
diff --git a/filter/e-filter-rule.c b/filter/e-filter-rule.c
index 9ad6641..4747296 100644
--- a/filter/e-filter-rule.c
+++ b/filter/e-filter-rule.c
@@ -30,7 +30,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include "e-util/e-alert-dialog.h"
+#include "libevolution-utils/e-alert-dialog.h"
 
 #include "e-filter-rule.h"
 #include "e-rule-context.h"
diff --git a/filter/e-rule-context.c b/filter/e-rule-context.c
index 9cedfa9..444b6c3 100644
--- a/filter/e-rule-context.c
+++ b/filter/e-rule-context.c
@@ -41,8 +41,8 @@
 
 #include <libedataserver/e-xml-utils.h>
 
-#include "e-util/e-alert-dialog.h"
-#include "e-util/e-xml-utils.h"
+#include "libevolution-utils/e-alert-dialog.h"
+#include "libevolution-utils/e-xml-utils.h"
 
 #include "e-filter-code.h"
 #include "e-filter-color.h"
diff --git a/filter/e-rule-editor.c b/filter/e-rule-editor.c
index 280b6fd..6db1d60 100644
--- a/filter/e-rule-editor.c
+++ b/filter/e-rule-editor.c
@@ -31,7 +31,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 "e-util/e-util.h"
 
diff --git a/libevolution-utils/e-alert-sink.c b/libevolution-utils/e-alert-sink.c
index ae3a736..53965c8 100644
--- a/libevolution-utils/e-alert-sink.c
+++ b/libevolution-utils/e-alert-sink.c
@@ -19,7 +19,7 @@
 /**
  * SECTION: e-alert-sink
  * @short_description: an interface to handle alerts
- * @include: e-util/e-alert-sink.h
+ * @include: libevolution-utils/e-alert-sink.h
  *
  * A widget that implements #EAlertSink means it can handle #EAlerts,
  * usually by displaying them to the user.
diff --git a/mail/e-mail-account-store.c b/mail/e-mail-account-store.c
index c14f75e..f22160c 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 f2e8fb9..75866f3 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 0d2381f..b54a764 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 0981fb3..bba721e 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 132ee43..c7e2c07 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 3ac0a5c..233e52b 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 1d32cc7..90c1349 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 a82d089..eee8121 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 23c1755..d54a51f 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 b49dc89..7b88991 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 2d829af..a94354d 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 43b0e24..2a6f0b5 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 1e39eba..5e893e6 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 d1a5866..3ffdd6c 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 c712431..f30a26f 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 c45f3d0..adea1b9 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 9a86710..597c87d 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 cc7407f..a9fd42e 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"
diff --git a/modules/addressbook/addressbook-config.c b/modules/addressbook/addressbook-config.c
index 52283ea..2e14c9f 100644
--- a/modules/addressbook/addressbook-config.c
+++ b/modules/addressbook/addressbook-config.c
@@ -46,7 +46,7 @@
 #include "addressbook-config.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-util-private.h"
 
 #include "addressbook/gui/widgets/eab-config.h"
diff --git a/modules/addressbook/e-book-shell-migrate.c b/modules/addressbook/e-book-shell-migrate.c
index 9b3c52c..d2d26c8 100644
--- a/modules/addressbook/e-book-shell-migrate.c
+++ b/modules/addressbook/e-book-shell-migrate.c
@@ -45,7 +45,7 @@
 
 #include "e-util/e-util.h"
 #include "e-util/e-util-private.h"
-#include "e-util/e-xml-utils.h"
+#include "libevolution-utils/e-xml-utils.h"
 
 #include "e-book-shell-migrate.h"
 
diff --git a/modules/addressbook/e-book-shell-view-actions.c b/modules/addressbook/e-book-shell-view-actions.c
index 2aa0e1a..33c382b 100644
--- a/modules/addressbook/e-book-shell-view-actions.c
+++ b/modules/addressbook/e-book-shell-view-actions.c
@@ -25,7 +25,7 @@
 
 #include "e-book-shell-view-private.h"
 
-#include <e-util/e-alert-dialog.h>
+#include <libevolution-utils/e-alert-dialog.h>
 #include <e-util/e-util.h>
 #include <filter/e-filter-rule.h>
 
diff --git a/modules/calendar/e-cal-shell-sidebar.c b/modules/calendar/e-cal-shell-sidebar.c
index 8b91a4c..633942d 100644
--- a/modules/calendar/e-cal-shell-sidebar.c
+++ b/modules/calendar/e-cal-shell-sidebar.c
@@ -29,7 +29,7 @@
 #include <glib/gi18n.h>
 #include <libedataserverui/e-client-utils.h>
 
-#include "e-util/e-alert-dialog.h"
+#include "libevolution-utils/e-alert-dialog.h"
 #include "widgets/misc/e-paned.h"
 
 #include "calendar/gui/e-calendar-selector.h"
diff --git a/modules/calendar/e-cal-shell-view-actions.c b/modules/calendar/e-cal-shell-view-actions.c
index aa5738e..9567665 100644
--- a/modules/calendar/e-cal-shell-view-actions.c
+++ b/modules/calendar/e-cal-shell-view-actions.c
@@ -23,7 +23,7 @@
 #include <config.h>
 #endif
 
-#include "e-util/e-alert-dialog.h"
+#include "libevolution-utils/e-alert-dialog.h"
 #include "e-cal-shell-view-private.h"
 
 /* This is for radio action groups whose value is persistent.  We
diff --git a/modules/calendar/e-memo-shell-sidebar.c b/modules/calendar/e-memo-shell-sidebar.c
index 9763a5d..4a012c7 100644
--- a/modules/calendar/e-memo-shell-sidebar.c
+++ b/modules/calendar/e-memo-shell-sidebar.c
@@ -30,7 +30,7 @@
 #include <libecal/e-cal-client.h>
 #include <libedataserverui/e-client-utils.h>
 
-#include "e-util/e-alert-dialog.h"
+#include "libevolution-utils/e-alert-dialog.h"
 #include "e-util/e-util.h"
 #include "calendar/gui/e-memo-list-selector.h"
 #include "calendar/gui/misc.h"
diff --git a/modules/calendar/e-memo-shell-view-actions.c b/modules/calendar/e-memo-shell-view-actions.c
index f8715ee..5a99624 100644
--- a/modules/calendar/e-memo-shell-view-actions.c
+++ b/modules/calendar/e-memo-shell-view-actions.c
@@ -23,7 +23,7 @@
 #include <config.h>
 #endif
 
-#include "e-util/e-alert-dialog.h"
+#include "libevolution-utils/e-alert-dialog.h"
 #include "e-memo-shell-view-private.h"
 
 static void
diff --git a/modules/calendar/e-task-shell-sidebar.c b/modules/calendar/e-task-shell-sidebar.c
index 1a59112..a2ceb77 100644
--- a/modules/calendar/e-task-shell-sidebar.c
+++ b/modules/calendar/e-task-shell-sidebar.c
@@ -30,7 +30,7 @@
 #include <libecal/e-cal-client.h>
 #include <libedataserverui/e-client-utils.h>
 
-#include "e-util/e-alert-dialog.h"
+#include "libevolution-utils/e-alert-dialog.h"
 #include "e-util/e-util.h"
 #include "calendar/gui/e-task-list-selector.h"
 #include "calendar/gui/misc.h"
diff --git a/modules/calendar/e-task-shell-view-actions.c b/modules/calendar/e-task-shell-view-actions.c
index 6c13d04..7f4fd08 100644
--- a/modules/calendar/e-task-shell-view-actions.c
+++ b/modules/calendar/e-task-shell-view-actions.c
@@ -23,7 +23,7 @@
 #include <config.h>
 #endif
 
-#include "e-util/e-alert-dialog.h"
+#include "libevolution-utils/e-alert-dialog.h"
 #include "e-task-shell-view-private.h"
 
 static void
diff --git a/modules/composer-autosave/e-composer-autosave.c b/modules/composer-autosave/e-composer-autosave.c
index f2b39c4..893db7f 100644
--- a/modules/composer-autosave/e-composer-autosave.c
+++ b/modules/composer-autosave/e-composer-autosave.c
@@ -22,7 +22,7 @@
 
 #include <libebackend/e-extension.h>
 
-#include <e-util/e-alert-dialog.h>
+#include <libevolution-utils/e-alert-dialog.h>
 #include <composer/e-msg-composer.h>
 
 #include "e-autosave-utils.h"
diff --git a/modules/composer-autosave/e-composer-registry.c b/modules/composer-autosave/e-composer-registry.c
index 3b69e16..03c227b 100644
--- a/modules/composer-autosave/e-composer-registry.c
+++ b/modules/composer-autosave/e-composer-registry.c
@@ -25,7 +25,7 @@
 
 #include <shell/e-shell.h>
 #include <shell/e-shell-window.h>
-#include <e-util/e-alert-dialog.h>
+#include <libevolution-utils/e-alert-dialog.h>
 #include <composer/e-msg-composer.h>
 
 #include "e-autosave-utils.h"
diff --git a/modules/mail/e-mail-attachment-handler.c b/modules/mail/e-mail-attachment-handler.c
index 69d8898..7e1b8fc 100644
--- a/modules/mail/e-mail-attachment-handler.c
+++ b/modules/mail/e-mail-attachment-handler.c
@@ -27,7 +27,7 @@
 
 #include <glib/gi18n.h>
 
-#include "e-util/e-alert-dialog.h"
+#include "libevolution-utils/e-alert-dialog.h"
 #include "mail/e-mail-backend.h"
 #include "mail/em-composer-utils.h"
 
diff --git a/modules/mail/em-account-prefs.c b/modules/mail/em-account-prefs.c
index 516b28a..18fed16 100644
--- a/modules/mail/em-account-prefs.c
+++ b/modules/mail/em-account-prefs.c
@@ -34,7 +34,7 @@
 
 #include <glib/gi18n.h>
 
-#include <e-util/e-alert-dialog.h>
+#include <libevolution-utils/e-alert-dialog.h>
 
 #include <shell/e-shell.h>
 
diff --git a/modules/mdn/evolution-mdn.c b/modules/mdn/evolution-mdn.c
index d0a1e6d..fdb7c18 100644
--- a/modules/mdn/evolution-mdn.c
+++ b/modules/mdn/evolution-mdn.c
@@ -22,7 +22,7 @@
 
 #include <libebackend/e-extension.h>
 
-#include <e-util/e-alert-dialog.h>
+#include <libevolution-utils/e-alert-dialog.h>
 
 #include <libemail-utils/e-account-utils.h>
 
diff --git a/modules/offline-alert/evolution-offline-alert.c b/modules/offline-alert/evolution-offline-alert.c
index c685815..5fcb797 100644
--- a/modules/offline-alert/evolution-offline-alert.c
+++ b/modules/offline-alert/evolution-offline-alert.c
@@ -24,7 +24,7 @@
 
 #include <shell/e-shell-view.h>
 #include <shell/e-shell-window-actions.h>
-#include <e-util/e-alert-sink.h>
+#include <libevolution-utils/e-alert-sink.h>
 
 /* Standard GObject macros */
 #define E_TYPE_OFFLINE_ALERT \
diff --git a/modules/startup-wizard/evolution-startup-wizard.c b/modules/startup-wizard/evolution-startup-wizard.c
index c0cac8d..50db857 100644
--- a/modules/startup-wizard/evolution-startup-wizard.c
+++ b/modules/startup-wizard/evolution-startup-wizard.c
@@ -25,7 +25,7 @@
 
 #include <shell/e-shell.h>
 
-#include <e-util/e-alert-dialog.h>
+#include <libevolution-utils/e-alert-dialog.h>
 #include <e-util/e-import.h>
 
 #include <libemail-utils/e-account-utils.h>
diff --git a/plugins/attachment-reminder/attachment-reminder.c b/plugins/attachment-reminder/attachment-reminder.c
index 9eb8dd7..3e5e649 100644
--- a/plugins/attachment-reminder/attachment-reminder.c
+++ b/plugins/attachment-reminder/attachment-reminder.c
@@ -33,7 +33,7 @@
 #include <mail/em-config.h>
 #include <mail/em-event.h>
 
-#include <e-util/e-alert-dialog.h>
+#include <libevolution-utils/e-alert-dialog.h>
 #include <e-util/e-plugin.h>
 
 #include <mail/em-utils.h>
diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c
index 5e9770d..e821113 100644
--- a/plugins/backup-restore/backup-restore.c
+++ b/plugins/backup-restore/backup-restore.c
@@ -33,7 +33,7 @@
 #include <glib/gstdio.h>
 #include "mail/em-config.h"
 #include "mail/em-account-editor.h"
-#include "e-util/e-alert-dialog.h"
+#include "libevolution-utils/e-alert-dialog.h"
 #include "e-util/e-util.h"
 #include "e-util/e-dialog-utils.h"
 #include "shell/e-shell-utils.h"
diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c
index baf985f..2f304cb 100644
--- a/plugins/bbdb/gaimbuddies.c
+++ b/plugins/bbdb/gaimbuddies.c
@@ -36,7 +36,7 @@
 #include <libxml/tree.h>
 #include <libxml/parser.h>
 #include <libxml/xmlmemory.h>
-#include <e-util/e-xml-utils.h>
+#include <libevolution-utils/e-xml-utils.h>
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c
index bcb373d..6b787b9 100644
--- a/plugins/external-editor/external-editor.c
+++ b/plugins/external-editor/external-editor.c
@@ -28,7 +28,7 @@
 
 #include <mail/em-config.h>
 #include <mail/em-composer-utils.h>
-#include <e-util/e-alert-dialog.h>
+#include <libevolution-utils/e-alert-dialog.h>
 #include <e-msg-composer.h>
 
 #include <glib/gi18n-lib.h>
diff --git a/plugins/face/face.c b/plugins/face/face.c
index f973ebf..c9023dc 100644
--- a/plugins/face/face.c
+++ b/plugins/face/face.c
@@ -29,7 +29,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 #include <mail/em-event.h>
-#include <e-util/e-alert-dialog.h>
+#include <libevolution-utils/e-alert-dialog.h>
 #include <e-util/e-util.h>
 #include <e-util/e-icon-factory.h>
 
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index 4e2b853..0b0acd4 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -35,7 +35,7 @@
 #include <libedataserverui/e-client-utils.h>
 #include <gtkhtml/gtkhtml-embedded.h>
 
-#include <e-util/e-alert-dialog.h>
+#include <libevolution-utils/e-alert-dialog.h>
 #include <e-util/e-mktemp.h>
 
 #include <shell/e-shell.h>
diff --git a/plugins/mailing-list-actions/mailing-list-actions.c b/plugins/mailing-list-actions/mailing-list-actions.c
index a9bc811..82214c0 100644
--- a/plugins/mailing-list-actions/mailing-list-actions.c
+++ b/plugins/mailing-list-actions/mailing-list-actions.c
@@ -30,7 +30,7 @@
 #include <glib/gi18n-lib.h>
 
 #include <e-util/e-util.h>
-#include <e-util/e-alert-dialog.h>
+#include <libevolution-utils/e-alert-dialog.h>
 
 #include <libemail-utils/e-account-utils.h>
 
diff --git a/plugins/save-calendar/save-calendar.c b/plugins/save-calendar/save-calendar.c
index 40ec512..818c5a3 100644
--- a/plugins/save-calendar/save-calendar.c
+++ b/plugins/save-calendar/save-calendar.c
@@ -33,7 +33,7 @@
 #include <libedataserver/e-source.h>
 #include <libedataserverui/e-source-selector.h>
 #include <libecal/e-cal-client.h>
-#include <e-util/e-alert-dialog.h>
+#include <libevolution-utils/e-alert-dialog.h>
 #include <e-util/e-plugin.h>
 #include <string.h>
 
diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c
index 63b6886..01431d0 100644
--- a/plugins/templates/templates.c
+++ b/plugins/templates/templates.c
@@ -30,7 +30,7 @@
 #include <glib/gi18n.h>
 #include <string.h>
 
-#include <e-util/e-alert-dialog.h>
+#include <libevolution-utils/e-alert-dialog.h>
 #include <e-util/e-config.h>
 #include <e-util/e-plugin.h>
 #include <e-util/e-util.h>
diff --git a/shell/e-shell-content.c b/shell/e-shell-content.c
index 069e0bf..baf3173 100644
--- a/shell/e-shell-content.c
+++ b/shell/e-shell-content.c
@@ -35,8 +35,8 @@
 #include <libebackend/e-extensible.h>
 
 #include "e-util/e-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 "filter/e-rule-editor.h"
 #include "widgets/misc/e-action-combo-box.h"
 #include "widgets/misc/e-alert-bar.h"
diff --git a/shell/e-shell-migrate.c b/shell/e-shell-migrate.c
index 3efddee..468d873 100644
--- a/shell/e-shell-migrate.c
+++ b/shell/e-shell-migrate.c
@@ -32,7 +32,7 @@
 #include <glib/gstdio.h>
 #include <libedataserver/e-xml-utils.h>
 
-#include "e-util/e-alert-dialog.h"
+#include "libevolution-utils/e-alert-dialog.h"
 #include "e-util/e-file-utils.h"
 #include "e-util/e-util.h"
 
diff --git a/shell/e-shell-sidebar.c b/shell/e-shell-sidebar.c
index b7e523f..040d35f 100644
--- a/shell/e-shell-sidebar.c
+++ b/shell/e-shell-sidebar.c
@@ -33,7 +33,7 @@
 
 #include <libebackend/e-extensible.h>
 
-#include <e-util/e-alert-sink.h>
+#include <libevolution-utils/e-alert-sink.h>
 #include <e-util/e-unicode.h>
 #include <shell/e-shell-view.h>
 
diff --git a/shell/e-shell-window-private.h b/shell/e-shell-window-private.h
index d1aef9b..cbb027c 100644
--- a/shell/e-shell-window-private.h
+++ b/shell/e-shell-window-private.h
@@ -31,8 +31,8 @@
 
 #include <e-util/e-util.h>
 #include <e-util/e-util-private.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-plugin-ui.h>
 #include <widgets/misc/e-alert-bar.h>
 #include <widgets/misc/e-import-assistant.h>
diff --git a/shell/e-shell.h b/shell/e-shell.h
index 04a8a18..ffff239 100644
--- a/shell/e-shell.h
+++ b/shell/e-shell.h
@@ -23,7 +23,7 @@
 #define E_SHELL_H
 
 #include <e-util/e-activity.h>
-#include <e-util/e-alert.h>
+#include <libevolution-utils/e-alert.h>
 
 #include <shell/e-shell-common.h>
 #include <shell/e-shell-backend.h>
diff --git a/widgets/menus/gal-view-collection.c b/widgets/menus/gal-view-collection.c
index 2cd26c9..b22e4f3 100644
--- a/widgets/menus/gal-view-collection.c
+++ b/widgets/menus/gal-view-collection.c
@@ -33,7 +33,7 @@
 
 #include <glib/gi18n.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-unicode.h"
 
 #include "gal-view-collection.h"
diff --git a/widgets/menus/gal-view-instance.c b/widgets/menus/gal-view-instance.c
index 84e4872..5fab5ab 100644
--- a/widgets/menus/gal-view-instance.c
+++ b/widgets/menus/gal-view-instance.c
@@ -39,7 +39,7 @@
 
 #include <glib/gi18n.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-unicode.h"
 
 #include "gal-define-views-dialog.h"
diff --git a/widgets/misc/e-alert-bar.h b/widgets/misc/e-alert-bar.h
index f1e84b5..f0cf39a 100644
--- a/widgets/misc/e-alert-bar.h
+++ b/widgets/misc/e-alert-bar.h
@@ -20,7 +20,7 @@
 #define E_ALERT_BAR_H
 
 #include <gtk/gtk.h>
-#include <e-util/e-alert.h>
+#include <libevolution-utils/e-alert.h>
 
 /* Standard GObject macros */
 #define E_TYPE_ALERT_BAR \
diff --git a/widgets/misc/e-preview-pane.c b/widgets/misc/e-preview-pane.c
index f9750c5..a94b313 100644
--- a/widgets/misc/e-preview-pane.c
+++ b/widgets/misc/e-preview-pane.c
@@ -27,8 +27,8 @@
 
 #include <gdk/gdkkeysyms.h>
 
-#include <e-util/e-alert-sink.h>
-#include <e-util/e-alert-dialog.h>
+#include <libevolution-utils/e-alert-sink.h>
+#include <libevolution-utils/e-alert-dialog.h>
 
 #include "e-alert-bar.h"
 
diff --git a/widgets/misc/e-signature-editor.c b/widgets/misc/e-signature-editor.c
index ef5466d..1c6fb55 100644
--- a/widgets/misc/e-signature-editor.c
+++ b/widgets/misc/e-signature-editor.c
@@ -28,8 +28,8 @@
 #include <string.h>
 #include <glib/gi18n.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 <libemail-utils/e-signature-utils.h>
 #include <misc/e-web-view.h>
 
diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c
index c35bbcc..26c9224 100644
--- a/widgets/misc/e-web-view.c
+++ b/widgets/misc/e-web-view.c
@@ -29,8 +29,8 @@
 #include <libebackend/e-extensible.h>
 
 #include <e-util/e-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-plugin-ui.h>
 
 #include "e-popup-action.h"
diff --git a/widgets/table/e-table-column-specification.c b/widgets/table/e-table-column-specification.c
index cd7e07a..a242d95 100644
--- a/widgets/table/e-table-column-specification.c
+++ b/widgets/table/e-table-column-specification.c
@@ -32,7 +32,7 @@
 #include <libxml/xmlmemory.h>
 
 #include "e-util/e-util.h"
-#include "e-util/e-xml-utils.h"
+#include "libevolution-utils/e-xml-utils.h"
 
 #include "e-table-column-specification.h"
 
diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c
index 45881d4..fcd186a 100644
--- a/widgets/table/e-table-field-chooser-item.c
+++ b/widgets/table/e-table-field-chooser-item.c
@@ -32,7 +32,7 @@
 
 #include <glib/gi18n.h>
 #include "e-util/e-util.h"
-#include "e-util/e-xml-utils.h"
+#include "libevolution-utils/e-xml-utils.h"
 #include "misc/e-canvas.h"
 
 #include "e-table-col-dnd.h"
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 780720e..8054a95 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -34,7 +34,7 @@
 
 #include <glib/gi18n.h>
 #include "e-util/e-util.h"
-#include "e-util/e-xml-utils.h"
+#include "libevolution-utils/e-xml-utils.h"
 #include "misc/e-canvas.h"
 
 #include "e-popup-menu.h"
diff --git a/widgets/table/e-table-memory.c b/widgets/table/e-table-memory.c
index e14997c..58c1f84 100644
--- a/widgets/table/e-table-memory.c
+++ b/widgets/table/e-table-memory.c
@@ -35,7 +35,7 @@
 #include <libxml/xmlmemory.h>
 
 #include "e-util/e-util.h"
-#include "e-util/e-xml-utils.h"
+#include "libevolution-utils/e-xml-utils.h"
 
 #include "e-table-memory.h"
 
diff --git a/widgets/table/e-table-sort-info.c b/widgets/table/e-table-sort-info.c
index cac2586..c477618 100644
--- a/widgets/table/e-table-sort-info.c
+++ b/widgets/table/e-table-sort-info.c
@@ -27,7 +27,7 @@
 #include <string.h>
 
 #include "e-util/e-util.h"
-#include "e-util/e-xml-utils.h"
+#include "libevolution-utils/e-xml-utils.h"
 
 #include "e-table-sort-info.h"
 
diff --git a/widgets/table/e-table-specification.c b/widgets/table/e-table-specification.c
index 03f0e45..11f35b0 100644
--- a/widgets/table/e-table-specification.c
+++ b/widgets/table/e-table-specification.c
@@ -34,7 +34,7 @@
 #include <libedataserver/e-xml-utils.h>
 
 #include "e-util/e-util.h"
-#include "e-util/e-xml-utils.h"
+#include "libevolution-utils/e-xml-utils.h"
 
 #include "e-table-specification.h"
 
diff --git a/widgets/table/e-table-state.c b/widgets/table/e-table-state.c
index a336281..6449fef 100644
--- a/widgets/table/e-table-state.c
+++ b/widgets/table/e-table-state.c
@@ -33,7 +33,7 @@
 #include <libedataserver/e-xml-utils.h>
 
 #include "e-util/e-util.h"
-#include "e-util/e-xml-utils.h"
+#include "libevolution-utils/e-xml-utils.h"
 
 #include "e-table-state.h"
 
diff --git a/widgets/table/e-tree-memory.c b/widgets/table/e-tree-memory.c
index 1b1bb9b..ec70924 100644
--- a/widgets/table/e-tree-memory.c
+++ b/widgets/table/e-tree-memory.c
@@ -35,7 +35,7 @@
 #include <libxml/xmlmemory.h>
 
 #include "e-util/e-util.h"
-#include "e-util/e-xml-utils.h"
+#include "libevolution-utils/e-xml-utils.h"
 
 #include "e-tree-memory.h"
 
diff --git a/widgets/table/e-tree-model.c b/widgets/table/e-tree-model.c
index 9bed842..3ba402d 100644
--- a/widgets/table/e-tree-model.c
+++ b/widgets/table/e-tree-model.c
@@ -35,7 +35,7 @@
 #include <libxml/xmlmemory.h>
 
 #include "e-util/e-util.h"
-#include "e-util/e-xml-utils.h"
+#include "libevolution-utils/e-xml-utils.h"
 
 #include "e-tree-model.h"
 
diff --git a/widgets/table/e-tree-sorted.c b/widgets/table/e-tree-sorted.c
index eee9414..ecc278b 100644
--- a/widgets/table/e-tree-sorted.c
+++ b/widgets/table/e-tree-sorted.c
@@ -40,7 +40,7 @@
 #include <libxml/xmlmemory.h>
 
 #include "e-util/e-util.h"
-#include "e-util/e-xml-utils.h"
+#include "libevolution-utils/e-xml-utils.h"
 
 #include "e-table-sorting-utils.h"
 #include "e-tree-sorted.h"
diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c
index dd7c1e7..8e029cd 100644
--- a/widgets/table/e-tree-table-adapter.c
+++ b/widgets/table/e-tree-table-adapter.c
@@ -34,7 +34,7 @@
 #include <libedataserver/e-xml-utils.h>
 
 #include "e-util/e-util.h"
-#include "e-util/e-xml-utils.h"
+#include "libevolution-utils/e-xml-utils.h"
 
 #include "e-table-sorting-utils.h"
 #include "e-tree-table-adapter.h"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]