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. --- modules/calendar/Makefile.am | 9 ++------- modules/calendar/e-cal-attachment-handler.c | 1 - modules/calendar/e-cal-attachment-handler.h | 2 +- modules/calendar/e-cal-config-calendar-item.c | 1 - modules/calendar/e-cal-config-date-edit.c | 1 - modules/calendar/e-cal-config-hook.c | 1 - modules/calendar/e-cal-event-hook.c | 1 - modules/calendar/e-cal-shell-backend.c | 5 ----- modules/calendar/e-cal-shell-content.c | 4 ---- modules/calendar/e-cal-shell-content.h | 1 - modules/calendar/e-cal-shell-sidebar.c | 4 ---- modules/calendar/e-cal-shell-sidebar.h | 2 -- modules/calendar/e-cal-shell-view-actions.c | 1 - modules/calendar/e-cal-shell-view-private.c | 1 - modules/calendar/e-cal-shell-view-private.h | 11 ----------- modules/calendar/e-calendar-preferences.c | 6 ------ modules/calendar/e-calendar-preferences.h | 3 --- modules/calendar/e-memo-shell-backend.c | 3 --- modules/calendar/e-memo-shell-content.c | 4 ---- modules/calendar/e-memo-shell-content.h | 3 --- modules/calendar/e-memo-shell-sidebar.c | 2 -- modules/calendar/e-memo-shell-sidebar.h | 1 - modules/calendar/e-memo-shell-view-actions.c | 1 - modules/calendar/e-memo-shell-view-private.c | 2 -- modules/calendar/e-memo-shell-view-private.h | 7 ------- modules/calendar/e-task-shell-backend.c | 3 --- modules/calendar/e-task-shell-content.c | 4 ---- modules/calendar/e-task-shell-content.h | 3 --- modules/calendar/e-task-shell-sidebar.c | 2 -- modules/calendar/e-task-shell-sidebar.h | 1 - modules/calendar/e-task-shell-view-actions.c | 1 - modules/calendar/e-task-shell-view-private.c | 2 -- modules/calendar/e-task-shell-view-private.h | 8 -------- 33 files changed, 3 insertions(+), 98 deletions(-) (limited to 'modules/calendar') diff --git a/modules/calendar/Makefile.am b/modules/calendar/Makefile.am index c5e547549a..7425f0d632 100644 --- a/modules/calendar/Makefile.am +++ b/modules/calendar/Makefile.am @@ -6,10 +6,10 @@ module_calendar_la_CPPFLAGS = \ -DEVOLUTION_BINDIR=\""$(bindir)"\" \ -DEVOLUTION_PRIVLIBEXECDIR=\""$(PRIVLIBEXECDIR)"\" \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) module_calendar_la_SOURCES = \ @@ -90,15 +90,10 @@ module_calendar_la_LIBADD = \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ - $(top_builddir)/libemail-utils/libemail-utils.la \ $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/filter/libfilter.la \ - $(top_builddir)/widgets/menus/libmenus.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(top_builddir)/widgets/table/libetable.la \ - $(top_builddir)/libevolution-utils/libevolution-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) module_calendar_la_LDFLAGS = \ diff --git a/modules/calendar/e-cal-attachment-handler.c b/modules/calendar/e-cal-attachment-handler.c index efe087da3f..372b826e51 100644 --- a/modules/calendar/e-cal-attachment-handler.c +++ b/modules/calendar/e-cal-attachment-handler.c @@ -29,7 +29,6 @@ #include #include #include -#include #include diff --git a/modules/calendar/e-cal-attachment-handler.h b/modules/calendar/e-cal-attachment-handler.h index b792fbf765..549199ec35 100644 --- a/modules/calendar/e-cal-attachment-handler.h +++ b/modules/calendar/e-cal-attachment-handler.h @@ -22,7 +22,7 @@ #ifndef E_CAL_ATTACHMENT_HANDLER_H #define E_CAL_ATTACHMENT_HANDLER_H -#include +#include /* Standard GObject macros */ #define E_TYPE_CAL_ATTACHMENT_HANDLER \ diff --git a/modules/calendar/e-cal-config-calendar-item.c b/modules/calendar/e-cal-config-calendar-item.c index 1efc8a91cd..ddf6835893 100644 --- a/modules/calendar/e-cal-config-calendar-item.c +++ b/modules/calendar/e-cal-config-calendar-item.c @@ -23,7 +23,6 @@ #include "e-cal-config-calendar-item.h" #include -#include #define E_CAL_CONFIG_CALENDAR_ITEM_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ diff --git a/modules/calendar/e-cal-config-date-edit.c b/modules/calendar/e-cal-config-date-edit.c index 3f28520bb0..0ac7e6e2cf 100644 --- a/modules/calendar/e-cal-config-date-edit.c +++ b/modules/calendar/e-cal-config-date-edit.c @@ -23,7 +23,6 @@ #include "e-cal-config-date-edit.h" #include -#include #define E_CAL_CONFIG_DATE_EDIT_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ diff --git a/modules/calendar/e-cal-config-hook.c b/modules/calendar/e-cal-config-hook.c index 80050fc0d0..57fb8b8cc5 100644 --- a/modules/calendar/e-cal-config-hook.c +++ b/modules/calendar/e-cal-config-hook.c @@ -25,7 +25,6 @@ #include "e-cal-config-hook.h" -#include "e-util/e-config.h" #include "calendar/gui/e-cal-config.h" static const EConfigHookTargetMask no_masks[] = { diff --git a/modules/calendar/e-cal-event-hook.c b/modules/calendar/e-cal-event-hook.c index 67db069d82..9f38e7005b 100644 --- a/modules/calendar/e-cal-event-hook.c +++ b/modules/calendar/e-cal-event-hook.c @@ -25,7 +25,6 @@ #include "e-cal-event-hook.h" -#include "e-util/e-event.h" #include "calendar/gui/e-cal-event.h" static const EEventHookTargetMask masks[] = { diff --git a/modules/calendar/e-cal-shell-backend.c b/modules/calendar/e-cal-shell-backend.c index 84193d9623..476831987a 100644 --- a/modules/calendar/e-cal-shell-backend.c +++ b/modules/calendar/e-cal-shell-backend.c @@ -28,15 +28,10 @@ #include #include #include -#include -#include "e-util/e-import.h" #include "shell/e-shell.h" #include "shell/e-shell-backend.h" #include "shell/e-shell-window.h" -#include "widgets/misc/e-cal-source-config.h" -#include "widgets/misc/e-preferences-window.h" -#include "widgets/misc/e-source-config-dialog.h" #include "calendar/gui/comp-util.h" #include "calendar/gui/dialogs/event-editor.h" diff --git a/modules/calendar/e-cal-shell-content.c b/modules/calendar/e-cal-shell-content.c index 5d8e7e6b8f..66ea4a460e 100644 --- a/modules/calendar/e-cal-shell-content.c +++ b/modules/calendar/e-cal-shell-content.c @@ -28,10 +28,6 @@ #include #include -#include "widgets/menus/gal-view-etable.h" -#include "widgets/misc/e-paned.h" -#include "widgets/misc/e-selectable.h" - #include "calendar/gui/calendar-config.h" #include "calendar/gui/calendar-view.h" #include "calendar/gui/e-cal-list-view.h" diff --git a/modules/calendar/e-cal-shell-content.h b/modules/calendar/e-cal-shell-content.h index 21e971b159..45aedf90c2 100644 --- a/modules/calendar/e-cal-shell-content.h +++ b/modules/calendar/e-cal-shell-content.h @@ -29,7 +29,6 @@ #include #include #include -#include /* Standard GObject macros */ #define E_TYPE_CAL_SHELL_CONTENT \ diff --git a/modules/calendar/e-cal-shell-sidebar.c b/modules/calendar/e-cal-shell-sidebar.c index 809ccb569f..7555950cd1 100644 --- a/modules/calendar/e-cal-shell-sidebar.c +++ b/modules/calendar/e-cal-shell-sidebar.c @@ -27,10 +27,6 @@ #include #include -#include - -#include "libevolution-utils/e-alert-dialog.h" -#include "widgets/misc/e-paned.h" #include "calendar/gui/e-calendar-selector.h" #include "calendar/gui/misc.h" diff --git a/modules/calendar/e-cal-shell-sidebar.h b/modules/calendar/e-cal-shell-sidebar.h index 4a4ab6d482..6daabe25ca 100644 --- a/modules/calendar/e-cal-shell-sidebar.h +++ b/modules/calendar/e-cal-shell-sidebar.h @@ -23,11 +23,9 @@ #define E_CAL_SHELL_SIDEBAR_H #include -#include #include #include -#include /* Standard GObject macros */ #define E_TYPE_CAL_SHELL_SIDEBAR \ diff --git a/modules/calendar/e-cal-shell-view-actions.c b/modules/calendar/e-cal-shell-view-actions.c index f72e765b3b..f3523c9d8b 100644 --- a/modules/calendar/e-cal-shell-view-actions.c +++ b/modules/calendar/e-cal-shell-view-actions.c @@ -23,7 +23,6 @@ #include #endif -#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-cal-shell-view-private.c b/modules/calendar/e-cal-shell-view-private.c index 8159e3d22b..d62b977b94 100644 --- a/modules/calendar/e-cal-shell-view-private.c +++ b/modules/calendar/e-cal-shell-view-private.c @@ -28,7 +28,6 @@ #include "e-cal-shell-view-private.h" #include "calendar/gui/calendar-view-factory.h" -#include "widgets/menus/gal-view-factory-etable.h" #define CHECK_NB 5 diff --git a/modules/calendar/e-cal-shell-view-private.h b/modules/calendar/e-cal-shell-view-private.h index 97641389d7..b589907dad 100644 --- a/modules/calendar/e-cal-shell-view-private.h +++ b/modules/calendar/e-cal-shell-view-private.h @@ -28,20 +28,9 @@ #include #include -#include - -#include -#include -#include -#include #include -#include -#include -#include -#include - #include #include #include diff --git a/modules/calendar/e-calendar-preferences.c b/modules/calendar/e-calendar-preferences.c index b11a943957..2902a50a58 100644 --- a/modules/calendar/e-calendar-preferences.c +++ b/modules/calendar/e-calendar-preferences.c @@ -34,12 +34,6 @@ #include "calendar/gui/e-cal-config.h" #include "calendar/gui/e-timezone-entry.h" #include "calendar/gui/calendar-config.h" -#include "widgets/misc/e-alarm-selector.h" -#include "widgets/misc/e-dateedit.h" -#include "e-util/e-util.h" -#include "e-util/e-datetime-format.h" -#include "e-util/e-dialog-widgets.h" -#include "e-util/e-util-private.h" #include "shell/e-shell-utils.h" /* same is used for Birthdays & Anniversaries calendar */ diff --git a/modules/calendar/e-calendar-preferences.h b/modules/calendar/e-calendar-preferences.h index e7b954303c..d1e8ede3b7 100644 --- a/modules/calendar/e-calendar-preferences.h +++ b/modules/calendar/e-calendar-preferences.h @@ -24,10 +24,7 @@ #ifndef CAL_PREFERENCES_H #define CAL_PREFERENCES_H -#include - #include -#include /* Standard GObject macros */ #define E_TYPE_CALENDAR_PREFERENCES \ diff --git a/modules/calendar/e-memo-shell-backend.c b/modules/calendar/e-memo-shell-backend.c index fa4884bfc6..75fabd6d83 100644 --- a/modules/calendar/e-memo-shell-backend.c +++ b/modules/calendar/e-memo-shell-backend.c @@ -28,13 +28,10 @@ #include #include #include -#include #include "shell/e-shell.h" #include "shell/e-shell-backend.h" #include "shell/e-shell-window.h" -#include "widgets/misc/e-cal-source-config.h" -#include "widgets/misc/e-source-config-dialog.h" #include "calendar/gui/comp-util.h" #include "calendar/gui/dialogs/memo-editor.h" diff --git a/modules/calendar/e-memo-shell-content.c b/modules/calendar/e-memo-shell-content.c index bb92852956..abb1adadf4 100644 --- a/modules/calendar/e-memo-shell-content.c +++ b/modules/calendar/e-memo-shell-content.c @@ -27,11 +27,7 @@ #include -#include "e-util/e-selection.h" #include "shell/e-shell-utils.h" -#include "widgets/menus/gal-view-etable.h" -#include "widgets/misc/e-paned.h" -#include "widgets/misc/e-preview-pane.h" #include "calendar/gui/comp-util.h" #include "calendar/gui/e-cal-component-preview.h" diff --git a/modules/calendar/e-memo-shell-content.h b/modules/calendar/e-memo-shell-content.h index 18ee590fc7..03a7fdc2eb 100644 --- a/modules/calendar/e-memo-shell-content.h +++ b/modules/calendar/e-memo-shell-content.h @@ -28,9 +28,6 @@ #include -#include -#include - /* Standard GObject macros */ #define E_TYPE_MEMO_SHELL_CONTENT \ (e_memo_shell_content_get_type ()) diff --git a/modules/calendar/e-memo-shell-sidebar.c b/modules/calendar/e-memo-shell-sidebar.c index 7d46384f82..64e74663c1 100644 --- a/modules/calendar/e-memo-shell-sidebar.c +++ b/modules/calendar/e-memo-shell-sidebar.c @@ -27,9 +27,7 @@ #include #include -#include -#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-sidebar.h b/modules/calendar/e-memo-shell-sidebar.h index ed9e051c48..17814ebaea 100644 --- a/modules/calendar/e-memo-shell-sidebar.h +++ b/modules/calendar/e-memo-shell-sidebar.h @@ -23,7 +23,6 @@ #define E_MEMO_SHELL_SIDEBAR_H #include -#include #include #include diff --git a/modules/calendar/e-memo-shell-view-actions.c b/modules/calendar/e-memo-shell-view-actions.c index f1ae7ffefb..0e0d28e885 100644 --- a/modules/calendar/e-memo-shell-view-actions.c +++ b/modules/calendar/e-memo-shell-view-actions.c @@ -23,7 +23,6 @@ #include #endif -#include "libevolution-utils/e-alert-dialog.h" #include "e-memo-shell-view-private.h" static void diff --git a/modules/calendar/e-memo-shell-view-private.c b/modules/calendar/e-memo-shell-view-private.c index 9f31e446ac..27ffad3dde 100644 --- a/modules/calendar/e-memo-shell-view-private.c +++ b/modules/calendar/e-memo-shell-view-private.c @@ -27,8 +27,6 @@ #include "e-memo-shell-view-private.h" -#include "widgets/menus/gal-view-factory-etable.h" - static void memo_shell_view_model_row_appended_cb (EMemoShellView *memo_shell_view, ECalModel *model) diff --git a/modules/calendar/e-memo-shell-view-private.h b/modules/calendar/e-memo-shell-view-private.h index 4e65d009de..0e0a2daae2 100644 --- a/modules/calendar/e-memo-shell-view-private.h +++ b/modules/calendar/e-memo-shell-view-private.h @@ -27,14 +27,7 @@ #include #include -#include "e-util/e-dialog-utils.h" -#include "e-util/e-file-utils.h" -#include "e-util/e-util.h" #include "shell/e-shell-utils.h" -#include "misc/e-cal-source-config.h" -#include "misc/e-popup-action.h" -#include "misc/e-selectable.h" -#include "misc/e-source-config-dialog.h" #include "calendar/gui/comp-util.h" #include "calendar/gui/e-cal-component-preview.h" diff --git a/modules/calendar/e-task-shell-backend.c b/modules/calendar/e-task-shell-backend.c index 4d76e50b8b..90ffb3cc6e 100644 --- a/modules/calendar/e-task-shell-backend.c +++ b/modules/calendar/e-task-shell-backend.c @@ -28,13 +28,10 @@ #include #include #include -#include #include "shell/e-shell.h" #include "shell/e-shell-backend.h" #include "shell/e-shell-window.h" -#include "widgets/misc/e-cal-source-config.h" -#include "widgets/misc/e-source-config-dialog.h" #include "calendar/gui/comp-util.h" #include "calendar/gui/dialogs/task-editor.h" diff --git a/modules/calendar/e-task-shell-content.c b/modules/calendar/e-task-shell-content.c index 89d4bde096..07d11a4b5b 100644 --- a/modules/calendar/e-task-shell-content.c +++ b/modules/calendar/e-task-shell-content.c @@ -27,11 +27,7 @@ #include -#include "e-util/e-selection.h" #include "shell/e-shell-utils.h" -#include "widgets/menus/gal-view-etable.h" -#include "widgets/misc/e-paned.h" -#include "widgets/misc/e-preview-pane.h" #include "calendar/gui/comp-util.h" #include "calendar/gui/e-cal-component-preview.h" diff --git a/modules/calendar/e-task-shell-content.h b/modules/calendar/e-task-shell-content.h index 84a5f675da..778dbde875 100644 --- a/modules/calendar/e-task-shell-content.h +++ b/modules/calendar/e-task-shell-content.h @@ -29,9 +29,6 @@ #include #include -#include -#include - /* Standard GObject macros */ #define E_TYPE_TASK_SHELL_CONTENT \ (e_task_shell_content_get_type ()) diff --git a/modules/calendar/e-task-shell-sidebar.c b/modules/calendar/e-task-shell-sidebar.c index d88d5e7028..1f46e2932e 100644 --- a/modules/calendar/e-task-shell-sidebar.c +++ b/modules/calendar/e-task-shell-sidebar.c @@ -27,9 +27,7 @@ #include #include -#include -#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-sidebar.h b/modules/calendar/e-task-shell-sidebar.h index d3c5358336..d9a143e278 100644 --- a/modules/calendar/e-task-shell-sidebar.h +++ b/modules/calendar/e-task-shell-sidebar.h @@ -23,7 +23,6 @@ #define E_TASK_SHELL_SIDEBAR_H #include -#include #include #include diff --git a/modules/calendar/e-task-shell-view-actions.c b/modules/calendar/e-task-shell-view-actions.c index 21043fb998..6709a6e7d7 100644 --- a/modules/calendar/e-task-shell-view-actions.c +++ b/modules/calendar/e-task-shell-view-actions.c @@ -23,7 +23,6 @@ #include #endif -#include "libevolution-utils/e-alert-dialog.h" #include "e-task-shell-view-private.h" static void diff --git a/modules/calendar/e-task-shell-view-private.c b/modules/calendar/e-task-shell-view-private.c index ba66c59caa..816b853ef2 100644 --- a/modules/calendar/e-task-shell-view-private.c +++ b/modules/calendar/e-task-shell-view-private.c @@ -25,8 +25,6 @@ #include "e-task-shell-view-private.h" -#include "widgets/menus/gal-view-factory-etable.h" - #include "e-util/e-util-private.h" static void diff --git a/modules/calendar/e-task-shell-view-private.h b/modules/calendar/e-task-shell-view-private.h index 062ac4564b..45bf20bd1d 100644 --- a/modules/calendar/e-task-shell-view-private.h +++ b/modules/calendar/e-task-shell-view-private.h @@ -27,16 +27,8 @@ #include #include #include -#include -#include "e-util/e-dialog-utils.h" -#include "e-util/e-file-utils.h" -#include "e-util/e-util.h" #include "shell/e-shell-utils.h" -#include "misc/e-cal-source-config.h" -#include "misc/e-popup-action.h" -#include "misc/e-selectable.h" -#include "misc/e-source-config-dialog.h" #include "calendar/gui/calendar-config.h" #include "calendar/gui/comp-util.h" -- cgit v1.2.3