Consolidate base utility libraries into libeutil.

Evolution consists of entirely too many small utility libraries, which
increases linking and loading time, places a burden on higher layers of
the application (e.g. modules) which has to remember to link to all the
small in-tree utility libraries, and makes it difficult to generate API
documentation for these utility libraries in one Gtk-Doc module.

Merge the following utility libraries under the umbrella of libeutil,
and enforce a single-include policy on libeutil so we can reorganize
the files as desired without disrupting its pseudo-public API.

   libemail-utils/libemail-utils.la
   libevolution-utils/libevolution-utils.la
   filter/libfilter.la
   widgets/e-timezone-dialog/libetimezonedialog.la
   widgets/menus/libmenus.la
   widgets/misc/libemiscwidgets.la
   widgets/table/libetable.la
   widgets/text/libetext.la

This also merges libedataserverui from the Evolution-Data-Server module,
since Evolution is its only consumer nowadays, and I'd like to make some
improvements to those APIs without concern for backward-compatibility.

And finally, start a Gtk-Doc module for libeutil.  It's going to be a
project just getting all the symbols _listed_ much less _documented_.
But the skeletal structure is in place and I'm off to a good start.

21 files changed, 5 insertions, 64 deletions

diff --git a/modules/mail/Makefile.am b/modules/mail/Makefile.am
index 97050ae10d..de1aa7c5c4 100644
--- a/modules/mail/Makefile.am
+++ b/modules/mail/Makefile.am
@@ -3,13 +3,13 @@ module_LTLIBRARIES = module-mail.la
 module_mail_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)							\
 	-I$(top_srcdir)							\
-	-I$(top_srcdir)/widgets						\
 	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"			\
 	-DEVOLUTION_UIDIR=\""$(uidir)"\"				\
 	-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\"			\
 	-DG_LOG_DOMAIN=\"evolution-module-mail\"			\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)					\
 	$(GNOME_PLATFORM_CFLAGS)					\
+	$(CHAMPLAIN_CFLAGS)						\
 	$(GTKHTML_CFLAGS)
 
 module_mail_la_SOURCES = \
@@ -52,26 +52,18 @@ module_mail_la_SOURCES = \
 	em-network-prefs.h
 
 module_mail_la_LIBADD = \
-	$(top_builddir)/libemail-utils/libemail-utils.la		\
 	$(top_builddir)/libemail-engine/libemail-engine.la		\
 	$(top_builddir)/e-util/libeutil.la				\
 	$(top_builddir)/em-format/libemformat.la			\
-	$(top_builddir)/filter/libfilter.la				\
 	$(top_builddir)/shell/libeshell.la				\
 	$(top_builddir)/composer/libcomposer.la				\
-	$(top_builddir)/widgets/table/libetable.la			\
-	$(top_builddir)/widgets/text/libetext.la			\
-	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
-	$(top_builddir)/widgets/menus/libmenus.la			\
 	$(top_builddir)/mail/libevolution-mail.la			\
 	$(top_builddir)/mail/importers/libevolution-mail-importers.la	\
 	$(top_builddir)/em-format/libemformat.la			\
-	$(top_builddir)/widgets/menus/libmenus.la			\
-	$(top_builddir)/filter/libfilter.la				\
-	$(top_builddir)/libevolution-utils/libevolution-utils.la	\
 	$(libevolution_mail_settings_la)				\
 	$(EVOLUTION_DATA_SERVER_LIBS)					\
 	$(GNOME_PLATFORM_LIBS)						\
+	$(CHAMPLAIN_LIBS)						\
 	$(GTKHTML_LIBS)
 
 module_mail_la_LDFLAGS = \
diff --git a/modules/mail/e-mail-attachment-handler.c b/modules/mail/e-mail-attachment-handler.c
index 8bc2aad12d..887ab53def 100644
--- a/modules/mail/e-mail-attachment-handler.c
+++ b/modules/mail/e-mail-attachment-handler.c
@@ -27,7 +27,6 @@
 
 #include <glib/gi18n.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/e-mail-attachment-handler.h b/modules/mail/e-mail-attachment-handler.h
index 13032b488c..52e1b3073e 100644
--- a/modules/mail/e-mail-attachment-handler.h
+++ b/modules/mail/e-mail-attachment-handler.h
@@ -22,7 +22,7 @@
 #ifndef E_MAIL_ATTACHMENT_HANDLER_H
 #define E_MAIL_ATTACHMENT_HANDLER_H
 
-#include <widgets/misc/e-attachment-handler.h>
+#include <e-util/e-util.h>
 
 /* Standard GObject macros */
 #define E_TYPE_MAIL_ATTACHMENT_HANDLER \
diff --git a/modules/mail/e-mail-config-hook.c b/modules/mail/e-mail-config-hook.c
index cc9734647b..2dee70e99b 100644
--- a/modules/mail/e-mail-config-hook.c
+++ b/modules/mail/e-mail-config-hook.c
@@ -25,7 +25,6 @@
 
 #include "e-mail-config-hook.h"
 
-#include "e-util/e-config.h"
 #include "mail/em-config.h"
 
 static const EConfigHookTargetMask no_masks[] = {
diff --git a/modules/mail/e-mail-config-web-view-gtkhtml.c b/modules/mail/e-mail-config-web-view-gtkhtml.c
index 2721d5edd1..40360d4e48 100644
--- a/modules/mail/e-mail-config-web-view-gtkhtml.c
+++ b/modules/mail/e-mail-config-web-view-gtkhtml.c
@@ -26,7 +26,6 @@
 #include "e-mail-config-web-view-gtkhtml.h"
 
 #include <shell/e-shell.h>
-#include <misc/e-web-view-gtkhtml.h>
 
 #define E_MAIL_CONFIG_WEB_VIEW_GTKHTML_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/modules/mail/e-mail-config-web-view.c b/modules/mail/e-mail-config-web-view.c
index 7a5bc4da98..5d2fb9296d 100644
--- a/modules/mail/e-mail-config-web-view.c
+++ b/modules/mail/e-mail-config-web-view.c
@@ -26,7 +26,6 @@
 #include "e-mail-config-web-view.h"
 
 #include <shell/e-shell.h>
-#include <misc/e-web-view.h>
 
 #define E_MAIL_CONFIG_WEB_VIEW_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/modules/mail/e-mail-event-hook.c b/modules/mail/e-mail-event-hook.c
index cd1dc63dd0..376a5e8561 100644
--- a/modules/mail/e-mail-event-hook.c
+++ b/modules/mail/e-mail-event-hook.c
@@ -25,7 +25,6 @@
 
 #include "e-mail-event-hook.h"
 
-#include "e-util/e-event.h"
 #include "mail/em-event.h"
 
 static const EEventHookTargetMask folder_masks[] = {
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c
index 9a56c00357..1abcb8a136 100644
--- a/modules/mail/e-mail-shell-backend.c
+++ b/modules/mail/e-mail-shell-backend.c
@@ -27,17 +27,11 @@
 
 #include <glib/gi18n.h>
 
-#include <e-util/e-import.h>
-#include <e-util/e-util.h>
-
 #include <shell/e-shell.h>
 #include <shell/e-shell-window.h>
 
 #include <composer/e-msg-composer.h>
 
-#include <widgets/misc/e-preferences-window.h>
-#include <widgets/misc/e-web-view.h>
-
 #include <libemail-engine/e-mail-folder-utils.h>
 #include <libemail-engine/e-mail-session.h>
 #include <libemail-engine/mail-config.h>
@@ -858,7 +852,6 @@ e_mail_shell_backend_edit_account (EMailShellBackend *mail_shell_backend,
 
 /******************* Code below here belongs elsewhere. *******************/
 
-#include "filter/e-filter-option.h"
 #include "shell/e-shell-settings.h"
 
 static GSList *
diff --git a/modules/mail/e-mail-shell-backend.h b/modules/mail/e-mail-shell-backend.h
index 5b2da24e5f..7ee68af3c8 100644
--- a/modules/mail/e-mail-shell-backend.h
+++ b/modules/mail/e-mail-shell-backend.h
@@ -22,9 +22,8 @@
 #ifndef E_MAIL_SHELL_BACKEND_H
 #define E_MAIL_SHELL_BACKEND_H
 
+#include <e-util/e-util.h>
 #include <mail/e-mail-backend.h>
-#include <filter/e-filter-element.h>
-#include <filter/e-filter-rule.h>
 
 /* Standard GObject macros */
 #define E_TYPE_MAIL_SHELL_BACKEND \
diff --git a/modules/mail/e-mail-shell-content.c b/modules/mail/e-mail-shell-content.c
index 15d477a3c0..12667c2761 100644
--- a/modules/mail/e-mail-shell-content.c
+++ b/modules/mail/e-mail-shell-content.c
@@ -29,12 +29,6 @@
 
 #include <e-util/e-util-private.h>
 
-#include <widgets/menus/gal-view-etable.h>
-#include <widgets/menus/gal-view-instance.h>
-#include <widgets/misc/e-paned.h>
-#include <widgets/misc/e-preview-pane.h>
-#include <widgets/misc/e-search-bar.h>
-
 #include <libemail-engine/mail-ops.h>
 
 #include <mail/e-mail-paned-view.h>
diff --git a/modules/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c
index 9752461191..cb37b6e374 100644
--- a/modules/mail/e-mail-shell-view-private.c
+++ b/modules/mail/e-mail-shell-view-private.c
@@ -25,9 +25,6 @@
 
 #include "e-mail-shell-view-private.h"
 
-#include "widgets/menus/gal-view-factory-etable.h"
-#include "widgets/misc/e-menu-tool-button.h"
-
 #include "e-util/e-util-private.h"
 
 typedef struct _AsyncContext AsyncContext;
diff --git a/modules/mail/e-mail-shell-view-private.h b/modules/mail/e-mail-shell-view-private.h
index 0e9feb2e10..bd9db02b10 100644
--- a/modules/mail/e-mail-shell-view-private.h
+++ b/modules/mail/e-mail-shell-view-private.h
@@ -28,11 +28,6 @@
 #include <gtkhtml/gtkhtml.h>
 #include <camel/camel-search-private.h>  /* for camel_search_word */
 
-#include <e-util/e-util.h>
-#include <e-util/e-ui-manager.h>
-
-#include <filter/e-filter-part.h>
-
 #include <libemail-engine/e-mail-folder-utils.h>
 #include <libemail-engine/e-mail-session.h>
 #include <libemail-engine/e-mail-session-utils.h>
@@ -41,10 +36,6 @@
 #include <libemail-engine/mail-ops.h>
 #include <libemail-engine/mail-tools.h>
 
-#include <misc/e-web-view.h>
-#include <misc/e-popup-action.h>
-#include <menus/gal-view-instance.h>
-
 #include <mail/e-mail-label-action.h>
 #include <mail/e-mail-label-dialog.h>
 #include <mail/e-mail-label-list-store.h>
diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c
index 419ad3edb3..4631dccecb 100644
--- a/modules/mail/e-mail-shell-view.c
+++ b/modules/mail/e-mail-shell-view.c
@@ -24,7 +24,6 @@
 #endif
 
 #include "e-mail-shell-view-private.h"
-#include "filter/e-filter-input.h"
 
 static gpointer parent_class;
 static GType mail_shell_view_type;
diff --git a/modules/mail/em-account-prefs.c b/modules/mail/em-account-prefs.c
index 17af8a41ab..7a45c2dc07 100644
--- a/modules/mail/em-account-prefs.c
+++ b/modules/mail/em-account-prefs.c
@@ -34,8 +34,6 @@
 
 #include <glib/gi18n.h>
 
-#include <libevolution-utils/e-alert-dialog.h>
-
 #include <shell/e-shell.h>
 
 #include <mail/e-mail-backend.h>
diff --git a/modules/mail/em-account-prefs.h b/modules/mail/em-account-prefs.h
index d2aafdb1cf..f5cae38b3a 100644
--- a/modules/mail/em-account-prefs.h
+++ b/modules/mail/em-account-prefs.h
@@ -23,10 +23,8 @@
 #define EM_ACCOUNT_PREFS_H
 
 #include <gtk/gtk.h>
-#include <table/e-table.h>
 #include <mail/e-mail-backend.h>
 #include <mail/e-mail-account-manager.h>
-#include <widgets/misc/e-preferences-window.h>
 
 /* Standard GObject macros */
 #define EM_TYPE_ACCOUNT_PREFS \
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index 4a7216915b..f9620096d0 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -38,16 +38,10 @@
 #include <gtkhtml/gtkhtml.h>
 #include <editor/gtkhtml-spell-language.h>
 
-#include <e-util/e-util.h>
-#include <e-util/e-util-private.h>
-
 #include <composer/e-msg-composer.h>
 
 #include <shell/e-shell-utils.h>
 
-#include <misc/e-charset-combo-box.h>
-#include <misc/e-mail-signature-manager.h>
-
 #include <mail/em-config.h>
 #include <mail/em-folder-selection-button.h>
 #include <mail/e-mail-junk-options.h>
diff --git a/modules/mail/em-composer-prefs.h b/modules/mail/em-composer-prefs.h
index 945e2d7669..211f4147a7 100644
--- a/modules/mail/em-composer-prefs.h
+++ b/modules/mail/em-composer-prefs.h
@@ -27,7 +27,6 @@
 #include <gtkhtml/gtkhtml.h>
 
 #include <shell/e-shell.h>
-#include <widgets/misc/e-preferences-window.h>
 
 /* Standard GObject macros */
 #define EM_TYPE_COMPOSER_PREFS \
diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c
index 0dd3d38147..3e5e5885bb 100644
--- a/modules/mail/em-mailer-prefs.c
+++ b/modules/mail/em-mailer-prefs.c
@@ -32,12 +32,6 @@
 #include <gtkhtml/gtkhtml-properties.h>
 #include <libxml/tree.h>
 
-#include <e-util/e-util.h>
-#include <e-util/e-datetime-format.h>
-#include <e-util/e-util-private.h>
-
-#include <misc/e-charset-combo-box.h>
-#include <misc/e-port-entry.h>
 #include <shell/e-shell-utils.h>
 
 #include <mail/e-mail-backend.h>
diff --git a/modules/mail/em-mailer-prefs.h b/modules/mail/em-mailer-prefs.h
index 8e66476bcb..afd88afb1f 100644
--- a/modules/mail/em-mailer-prefs.h
+++ b/modules/mail/em-mailer-prefs.h
@@ -26,7 +26,6 @@
 #include <gtk/gtk.h>
 
 #include <shell/e-shell.h>
-#include <widgets/misc/e-preferences-window.h>
 
 /* Standard GObject macros */
 #define EM_TYPE_MAILER_PREFS \
diff --git a/modules/mail/em-network-prefs.c b/modules/mail/em-network-prefs.c
index b43c8a169f..fe21b27486 100644
--- a/modules/mail/em-network-prefs.c
+++ b/modules/mail/em-network-prefs.c
@@ -35,7 +35,6 @@
 #include <glib/gstdio.h>
 #include <gdk/gdkkeysyms.h>
 
-#include <e-util/e-util.h>
 #include <e-util/e-util-private.h>
 
 #include <mail/em-config.h>
diff --git a/modules/mail/em-network-prefs.h b/modules/mail/em-network-prefs.h
index 8d67530f92..8fd062f502 100644
--- a/modules/mail/em-network-prefs.h
+++ b/modules/mail/em-network-prefs.h
@@ -24,7 +24,7 @@
 #define EM_NETWORK_PREFS_H
 
 #include <gtk/gtk.h>
-#include <widgets/misc/e-preferences-window.h>
+#include <e-util/e-util.h>
 
 /* Standard GObject macros */
 #define EM_TYPE_NETWORK_PREFS \