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.

25 files changed, 33 insertions, 94 deletions

diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am
index 02af20b87b..fa6ba86e6b 100644
--- a/calendar/gui/dialogs/Makefile.am
+++ b/calendar/gui/dialogs/Makefile.am
@@ -4,18 +4,18 @@ libcal_dialogs_la_CPPFLAGS = 						\
 	$(AM_CPPFLAGS)							\
 	-DG_LOG_DOMAIN=\"calendar-gui\"					\
 	-I$(top_srcdir)							\
-	-I$(top_srcdir)/widgets						\
 	-I$(top_builddir)						\
 	-I$(top_srcdir)/calendar					\
 	-I$(top_builddir)/shell						\
 	-I$(top_srcdir)/shell						\
-	-I$(top_srcdir)/widgets/misc					\
 	-DEVOLUTION_UIDIR=\""$(uidir)"\"				\
 	-DEVOLUTION_ICONDIR=\""$(icondir)"\"				\
 	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"			\
 	-DPREFIX=\""$(prefix)"\"					\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)					\
-	$(GNOME_PLATFORM_CFLAGS)
+	$(GNOME_PLATFORM_CFLAGS)					\
+	$(CHAMPLAIN_CFLAGS)						\
+	$(GTKHTML_CFLAGS)
 
 ecalendarincludedir = $(privincludedir)/calendar/gui/dialogs
 
@@ -50,10 +50,11 @@ ecalendarinclude_HEADERS =		\
 libcal_dialogs_la_LIBADD =					\
 	$(top_builddir)/addressbook/util/libeabutil.la		\
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
-	$(GNOME_PLATFORM_LIBS)
+	$(GNOME_PLATFORM_LIBS)					\
+	$(CHAMPLAIN_LIBS)					\
+	$(GTKHTML_LIBS)
 
 libcal_dialogs_la_SOURCES =		\
-	$(IDL_GENERATED)		\
 	alarm-dialog.c			\
 	alarm-dialog.h			\
 	alarm-list-dialog.c		\
diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c
index dda1d8548b..d88fd12fb6 100644
--- a/calendar/gui/dialogs/alarm-dialog.c
+++ b/calendar/gui/dialogs/alarm-dialog.c
@@ -32,12 +32,11 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <libebook/libebook.h>
-#include <libedataserverui/libedataserverui.h>
 
-#include "e-util/e-util.h"
-#include "e-util/e-dialog-widgets.h"
-#include "e-util/e-util-private.h"
 #include <libical/icalattach.h>
+
+#include "e-util/e-util.h"
+
 #include "../calendar-config.h"
 #include "comp-editor-util.h"
 #include "alarm-dialog.h"
diff --git a/calendar/gui/dialogs/cancel-comp.c b/calendar/gui/dialogs/cancel-comp.c
index 5dbdb0ef8e..29038f4483 100644
--- a/calendar/gui/dialogs/cancel-comp.c
+++ b/calendar/gui/dialogs/cancel-comp.c
@@ -26,10 +26,12 @@
 #include <config.h>
 #endif
 
+#include "cancel-comp.h"
+
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include "libevolution-utils/e-alert-dialog.h"
-#include "cancel-comp.h"
+
+#include "e-util/e-util.h"
 
 /* is_past_event:
  *
diff --git a/calendar/gui/dialogs/cancel-comp.h b/calendar/gui/dialogs/cancel-comp.h
index bfc1c6cbc4..5e6ea88076 100644
--- a/calendar/gui/dialogs/cancel-comp.h
+++ b/calendar/gui/dialogs/cancel-comp.h
@@ -26,6 +26,7 @@
 #ifndef CANCEL_COMP_H
 #define CANCEL_COMP_H
 
+#include <gtk/gtk.h>
 #include <libecal/libecal.h>
 
 gboolean cancel_component_dialog (GtkWindow *parent, ECalClient *cal_client, ECalComponent *comp, gboolean deleting);
diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c
index 5938f52e14..52651190ac 100644
--- a/calendar/gui/dialogs/comp-editor-util.c
+++ b/calendar/gui/dialogs/comp-editor-util.c
@@ -31,9 +31,9 @@
 #include <libical/ical.h>
 #include <glib/gi18n.h>
 
-#include "widgets/misc/e-dateedit.h"
+#include "shell/e-shell.h"
+
 #include "../itip-utils.h"
-#include <shell/e-shell.h>
 #include "comp-editor-util.h"
 
 /**
diff --git a/calendar/gui/dialogs/comp-editor-util.h b/calendar/gui/dialogs/comp-editor-util.h
index a4ecc468a7..8c80683696 100644
--- a/calendar/gui/dialogs/comp-editor-util.h
+++ b/calendar/gui/dialogs/comp-editor-util.h
@@ -28,7 +28,6 @@
 #include <gtk/gtk.h>
 #include "comp-editor.h"
 #include "../e-meeting-attendee.h"
-#include <misc/e-dateedit.h>
 
 void comp_editor_dates (CompEditorPageDates *date, ECalComponent *comp);
 void comp_editor_free_dates (CompEditorPageDates *dates);
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 4eaf1bce75..5fa87e861a 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -38,10 +38,6 @@
 #include <gdk/gdkkeysyms.h>
 #include <libebackend/libebackend.h>
 
-#include <e-util/e-util.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>
 
 #include "../print.h"
@@ -55,11 +51,6 @@
 #include "comp-editor.h"
 #include "comp-editor-util.h"
 #include "../calendar-config-keys.h"
-#include "widgets/misc/e-attachment-view.h"
-#include "widgets/misc/e-attachment-paned.h"
-
-#include "libevolution-utils/e-alert-dialog.h"
-#include "e-util/e-ui-manager.h"
 
 #define COMP_EDITOR_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/calendar/gui/dialogs/comp-editor.h b/calendar/gui/dialogs/comp-editor.h
index 14fbc0ff5b..72598acfe0 100644
--- a/calendar/gui/dialogs/comp-editor.h
+++ b/calendar/gui/dialogs/comp-editor.h
@@ -28,10 +28,10 @@
 #include <gtk/gtk.h>
 #include <libecal/libecal.h>
 
+#include <shell/e-shell.h>
+
 #include "../itip-utils.h"
 #include "comp-editor-page.h"
-#include <shell/e-shell.h>
-#include <misc/e-focus-tracker.h>
 
 /* Standard GObject macros */
 #define TYPE_COMP_EDITOR \
diff --git a/calendar/gui/dialogs/copy-source-dialog.c b/calendar/gui/dialogs/copy-source-dialog.c
index 5a7889e138..f8b668b933 100644
--- a/calendar/gui/dialogs/copy-source-dialog.c
+++ b/calendar/gui/dialogs/copy-source-dialog.c
@@ -27,7 +27,8 @@
 #endif
 
 #include <glib/gi18n.h>
-#include <libedataserverui/libedataserverui.h>
+
+#include "e-util/e-util.h"
 
 #include "copy-source-dialog.h"
 #include "select-source-dialog.h"
diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c
index 93e2df0d91..0ec054cd39 100644
--- a/calendar/gui/dialogs/delete-comp.c
+++ b/calendar/gui/dialogs/delete-comp.c
@@ -26,10 +26,12 @@
 #include <config.h>
 #endif
 
-#include <glib/gi18n.h>
-#include "libevolution-utils/e-alert-dialog.h"
 #include "delete-comp.h"
 
+#include <glib/gi18n.h>
+
+#include "e-util/e-util.h"
+
 /**
  * delete_component_dialog:
  * @comp: A calendar component if a single component is to be deleted, or NULL
diff --git a/calendar/gui/dialogs/e-delegate-dialog.c b/calendar/gui/dialogs/e-delegate-dialog.c
index 9ae253dc00..9c5e17f59e 100644
--- a/calendar/gui/dialogs/e-delegate-dialog.c
+++ b/calendar/gui/dialogs/e-delegate-dialog.c
@@ -29,7 +29,6 @@
 #include <gtk/gtk.h>
 #include <libical/ical.h>
 #include <libebook/libebook.h>
-#include <libedataserverui/libedataserverui.h>
 
 #include "e-util/e-util.h"
 #include "e-util/e-util-private.h"
diff --git a/calendar/gui/dialogs/e-send-options-utils.h b/calendar/gui/dialogs/e-send-options-utils.h
index f5c3f0a408..6d365b3424 100644
--- a/calendar/gui/dialogs/e-send-options-utils.h
+++ b/calendar/gui/dialogs/e-send-options-utils.h
@@ -27,7 +27,7 @@
 
 #include <libecal/libecal.h>
 
-#include "misc/e-send-options.h"
+#include <e-util/e-util.h>
 
 void		e_send_options_utils_set_default_data
 						(ESendOptionsDialog *sod,
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index 0681aa4ed7..2ea6297dcc 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -32,11 +32,6 @@
 #include <string.h>
 #include <glib/gi18n.h>
 
-#include <misc/e-dateedit.h>
-#include <e-util/e-plugin-ui.h>
-#include <e-util/e-util-private.h>
-#include <e-util/e-ui-manager.h>
-
 #include "event-page.h"
 #include "recurrence-page.h"
 #include "schedule-page.h"
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index 12931cee09..793e98e49e 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -35,19 +35,6 @@
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 
-#include <libedataserverui/libedataserverui.h>
-
-#include <e-util/e-util.h>
-#include <e-util/e-categories-config.h>
-#include <e-util/e-dialog-utils.h>
-#include <e-util/e-dialog-widgets.h>
-#include <e-util/e-util-private.h>
-
-#include <misc/e-dateedit.h>
-#include <misc/e-send-options.h>
-#include <misc/e-spell-entry.h>
-#include <misc/e-buffer-tagger.h>
-
 #include "../e-alarm-list.h"
 #include "../e-meeting-attendee.h"
 #include "../e-meeting-list-view.h"
diff --git a/calendar/gui/dialogs/memo-editor.c b/calendar/gui/dialogs/memo-editor.c
index ae0d351618..839bce7bed 100644
--- a/calendar/gui/dialogs/memo-editor.c
+++ b/calendar/gui/dialogs/memo-editor.c
@@ -31,9 +31,6 @@
 #include <string.h>
 #include <glib/gi18n.h>
 
-#include <e-util/e-plugin-ui.h>
-#include <e-util/e-util-private.h>
-
 #include "memo-page.h"
 #include "cancel-comp.h"
 #include "memo-editor.h"
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
index ec99587f4e..79b659a898 100644
--- a/calendar/gui/dialogs/memo-page.c
+++ b/calendar/gui/dialogs/memo-page.c
@@ -34,17 +34,6 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include <libedataserverui/libedataserverui.h>
-
-#include <e-util/e-util.h>
-#include <e-util/e-categories-config.h>
-#include <e-util/e-dialog-utils.h>
-#include <e-util/e-util-private.h>
-
-#include <misc/e-dateedit.h>
-#include <misc/e-spell-entry.h>
-#include <misc/e-buffer-tagger.h>
-
 #include "../calendar-config.h"
 #include "comp-editor.h"
 #include "comp-editor-util.h"
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index 77862c6584..d5a93ea9db 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -33,17 +33,12 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include <misc/e-dateedit.h>
 #include "../tag-calendar.h"
 #include "../weekday-picker.h"
 #include "comp-editor-util.h"
 #include "../e-date-time-list.h"
 #include "recurrence-page.h"
 
-#include "e-util/e-util.h"
-#include "e-util/e-dialog-widgets.h"
-#include "e-util/e-util-private.h"
-
 #define RECURRENCE_PAGE_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), TYPE_RECURRENCE_PAGE, RecurrencePagePrivate))
diff --git a/calendar/gui/dialogs/save-comp.c b/calendar/gui/dialogs/save-comp.c
index 2fd53bd5db..3ae26252b7 100644
--- a/calendar/gui/dialogs/save-comp.c
+++ b/calendar/gui/dialogs/save-comp.c
@@ -25,7 +25,6 @@
 #include <config.h>
 #endif
 
-#include "libevolution-utils/e-alert-dialog.h"
 #include "save-comp.h"
 #include "comp-editor.h"
 
diff --git a/calendar/gui/dialogs/schedule-page.c b/calendar/gui/dialogs/schedule-page.c
index 516a973751..bd3e05e171 100644
--- a/calendar/gui/dialogs/schedule-page.c
+++ b/calendar/gui/dialogs/schedule-page.c
@@ -31,8 +31,7 @@
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <e-util/e-util-private.h>
-#include <misc/e-dateedit.h>
+
 #include "../e-meeting-time-sel.h"
 #include "../itip-utils.h"
 #include "comp-editor-util.h"
diff --git a/calendar/gui/dialogs/schedule-page.h b/calendar/gui/dialogs/schedule-page.h
index 1c554364fa..9d38de4a23 100644
--- a/calendar/gui/dialogs/schedule-page.h
+++ b/calendar/gui/dialogs/schedule-page.h
@@ -28,7 +28,6 @@
 #include "../e-meeting-store.h"
 #include "comp-editor.h"
 #include "comp-editor-page.h"
-#include <libedataserverui/libedataserverui.h>
 
 /* Standard GObject macros */
 #define TYPE_SCHEDULE_PAGE \
diff --git a/calendar/gui/dialogs/select-source-dialog.c b/calendar/gui/dialogs/select-source-dialog.c
index 9f80038e8b..5bdf4a7c5e 100644
--- a/calendar/gui/dialogs/select-source-dialog.c
+++ b/calendar/gui/dialogs/select-source-dialog.c
@@ -26,7 +26,8 @@
 #endif
 
 #include <glib/gi18n.h>
-#include <libedataserverui/libedataserverui.h>
+
+#include "e-util/e-util.h"
 
 #include "select-source-dialog.h"
 
diff --git a/calendar/gui/dialogs/send-comp.c b/calendar/gui/dialogs/send-comp.c
index 73938be875..b69e6eaade 100644
--- a/calendar/gui/dialogs/send-comp.c
+++ b/calendar/gui/dialogs/send-comp.c
@@ -26,10 +26,12 @@
 #include <config.h>
 #endif
 
-#include <glib/gi18n-lib.h>
-#include "libevolution-utils/e-alert-dialog.h"
 #include "send-comp.h"
 
+#include <glib/gi18n-lib.h>
+
+#include "e-util/e-util.h"
+
 static gboolean
 component_has_new_attendees (ECalComponent *comp)
 {
diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c
index 2ada645842..e40db5ba86 100644
--- a/calendar/gui/dialogs/task-details-page.c
+++ b/calendar/gui/dialogs/task-details-page.c
@@ -31,16 +31,11 @@
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <misc/e-dateedit.h>
-#include <misc/e-url-entry.h>
+
 #include "../e-timezone-entry.h"
 #include "comp-editor-util.h"
 #include "task-details-page.h"
 
-#include "e-util/e-util.h"
-#include "e-util/e-dialog-widgets.h"
-#include "e-util/e-util-private.h"
-
 #define TASK_DETAILS_PAGE_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), TYPE_TASK_DETAILS_PAGE, TaskDetailsPagePrivate))
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index 0c81d3ea47..07ad568f9d 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -32,9 +32,6 @@
 #include <string.h>
 #include <glib/gi18n.h>
 
-#include "e-util/e-plugin-ui.h"
-#include "e-util/e-util-private.h"
-
 #include "task-page.h"
 #include "task-details-page.h"
 #include "cancel-comp.h"
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index ebf279cb22..d8d64f32d6 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -34,17 +34,6 @@
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 
-#include <libedataserverui/libedataserverui.h>
-
-#include <misc/e-dateedit.h>
-#include <misc/e-spell-entry.h>
-#include <misc/e-buffer-tagger.h>
-
-#include <e-util/e-categories-config.h>
-#include <e-util/e-dialog-utils.h>
-#include <e-util/e-util-private.h>
-#include <e-util/e-util.h>
-
 #include "../e-meeting-attendee.h"
 #include "../e-meeting-list-view.h"
 #include "../e-meeting-store.h"