From d09d8de870b6697c8a8b262e7e077b871a69b315 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 10 Dec 2012 08:09:59 -0500 Subject: 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. --- mail/e-mail-reader.c | 46 ++++++++++++++++++++-------------------------- 1 file changed, 20 insertions(+), 26 deletions(-) (limited to 'mail/e-mail-reader.c') diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c index a659404092..c2500a5d59 100644 --- a/mail/e-mail-reader.c +++ b/mail/e-mail-reader.c @@ -32,36 +32,30 @@ #include #endif -#include "e-util/e-charset.h" -#include "e-util/e-util.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" -#include "libemail-utils/mail-mt.h" - -#include "libemail-engine/mail-ops.h" -#include "libemail-engine/e-mail-utils.h" #include "libemail-engine/e-mail-enumtypes.h" +#include "libemail-engine/e-mail-utils.h" +#include "libemail-engine/mail-mt.h" +#include "libemail-engine/mail-ops.h" -#include "mail/e-mail-backend.h" -#include "mail/e-mail-browser.h" -#include "mail/e-mail-reader-utils.h" -#include "mail/e-mail-ui-session.h" -#include "mail/e-mail-view.h" -#include "mail/em-composer-utils.h" -#include "mail/em-event.h" -#include "mail/em-folder-selector.h" -#include "mail/em-folder-tree.h" -#include "mail/em-utils.h" -#include "mail/mail-autofilter.h" -#include "mail/mail-vfolder-ui.h" -#include "mail/message-list.h" - -#include -#include -#include +#include "em-format/e-mail-formatter.h" +#include "em-format/e-mail-parser.h" +#include "em-format/e-mail-part-utils.h" + +#include "e-mail-backend.h" +#include "e-mail-browser.h" +#include "e-mail-reader-utils.h" +#include "e-mail-ui-session.h" +#include "e-mail-view.h" +#include "em-composer-utils.h" +#include "em-event.h" +#include "em-folder-selector.h" +#include "em-folder-tree.h" +#include "em-utils.h" +#include "mail-autofilter.h" +#include "mail-vfolder-ui.h" +#include "message-list.h" #define E_MAIL_READER_GET_PRIVATE(obj) \ ((EMailReaderPrivate *) g_object_get_qdata \ -- cgit v1.2.3