diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2012-12-10 21:09:59 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2012-12-13 03:33:43 +0800 |
commit | d09d8de870b6697c8a8b262e7e077b871a69b315 (patch) | |
tree | 3b718882e7a0bb0a996daf2967a033d91714c9b5 /modules/addressbook | |
parent | b61331ed03ac1c7a9b8614e25510040b9c60ae02 (diff) | |
download | gsoc2013-evolution-d09d8de870b6697c8a8b262e7e077b871a69b315.tar.gz gsoc2013-evolution-d09d8de870b6697c8a8b262e7e077b871a69b315.tar.zst gsoc2013-evolution-d09d8de870b6697c8a8b262e7e077b871a69b315.zip |
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.
Diffstat (limited to 'modules/addressbook')
-rw-r--r-- | modules/addressbook/Makefile.am | 8 | ||||
-rw-r--r-- | modules/addressbook/autocompletion-config.c | 4 | ||||
-rw-r--r-- | modules/addressbook/autocompletion-config.h | 1 | ||||
-rw-r--r-- | modules/addressbook/e-book-config-hook.c | 1 | ||||
-rw-r--r-- | modules/addressbook/e-book-config-name-selector-entry.c | 2 | ||||
-rw-r--r-- | modules/addressbook/e-book-shell-backend.c | 5 | ||||
-rw-r--r-- | modules/addressbook/e-book-shell-content.c | 3 | ||||
-rw-r--r-- | modules/addressbook/e-book-shell-content.h | 2 | ||||
-rw-r--r-- | modules/addressbook/e-book-shell-sidebar.h | 2 | ||||
-rw-r--r-- | modules/addressbook/e-book-shell-view-actions.c | 6 | ||||
-rw-r--r-- | modules/addressbook/e-book-shell-view-private.c | 1 | ||||
-rw-r--r-- | modules/addressbook/e-book-shell-view-private.h | 7 |
12 files changed, 1 insertions, 41 deletions
diff --git a/modules/addressbook/Makefile.am b/modules/addressbook/Makefile.am index 49b24e2693..63b1f4b965 100644 --- a/modules/addressbook/Makefile.am +++ b/modules/addressbook/Makefile.am @@ -4,11 +4,8 @@ module_addressbook_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -DG_LOG_DOMAIN=\"evolution-addressbook\" \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -I$(top_srcdir)/shell \ -I$(top_builddir)/shell \ - -I$(top_srcdir)/widgets/menus \ - -I$(top_srcdir)/widgets/misc \ -I$(top_srcdir)/addressbook/util \ -I$(top_srcdir)/addressbook/gui/contact-editor \ -I$(top_srcdir)/addressbook/gui/contact-list-editor \ @@ -64,14 +61,9 @@ module_addressbook_la_LIBADD = \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \ $(top_builddir)/addressbook/gui/widgets/libeabwidgets.la \ - $(top_builddir)/filter/libfilter.la \ $(top_builddir)/addressbook/util/libeabutil.la \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.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)/addressbook/importers/libevolution-addressbook-importers.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ diff --git a/modules/addressbook/autocompletion-config.c b/modules/addressbook/autocompletion-config.c index 615328992a..d39ea53382 100644 --- a/modules/addressbook/autocompletion-config.c +++ b/modules/addressbook/autocompletion-config.c @@ -25,10 +25,6 @@ #include "autocompletion-config.h" #include <glib/gi18n.h> -#include <libedataserverui/libedataserverui.h> - -#include "e-util/e-datetime-format.h" -#include "misc/e-autocomplete-selector.h" static GtkWidget * add_section (GtkWidget *container, diff --git a/modules/addressbook/autocompletion-config.h b/modules/addressbook/autocompletion-config.h index 2cebea1b4a..2c60301922 100644 --- a/modules/addressbook/autocompletion-config.h +++ b/modules/addressbook/autocompletion-config.h @@ -26,7 +26,6 @@ #define _AUTOCOMPLETION_CONFIG_H #include <shell/e-shell.h> -#include <widgets/misc/e-preferences-window.h> G_BEGIN_DECLS diff --git a/modules/addressbook/e-book-config-hook.c b/modules/addressbook/e-book-config-hook.c index dd4b38b5e5..8ee342473e 100644 --- a/modules/addressbook/e-book-config-hook.c +++ b/modules/addressbook/e-book-config-hook.c @@ -25,7 +25,6 @@ #include "e-book-config-hook.h" -#include "e-util/e-config.h" #include "addressbook/gui/widgets/eab-config.h" static const EConfigHookTargetMask no_masks[] = { diff --git a/modules/addressbook/e-book-config-name-selector-entry.c b/modules/addressbook/e-book-config-name-selector-entry.c index ac7ccf4fce..acc38a773a 100644 --- a/modules/addressbook/e-book-config-name-selector-entry.c +++ b/modules/addressbook/e-book-config-name-selector-entry.c @@ -22,7 +22,7 @@ #include "e-book-config-name-selector-entry.h" -#include <libedataserverui/libedataserverui.h> +#include <e-util/e-util.h> #define E_BOOK_CONFIG_NAME_SELECTOR_ENTRY_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ diff --git a/modules/addressbook/e-book-shell-backend.c b/modules/addressbook/e-book-shell-backend.c index 2475312832..5dded832df 100644 --- a/modules/addressbook/e-book-shell-backend.c +++ b/modules/addressbook/e-book-shell-backend.c @@ -28,14 +28,9 @@ #include <string.h> #include <glib/gi18n.h> #include <libebook/libebook.h> -#include <libedataserverui/libedataserverui.h> -#include "e-util/e-import.h" #include "shell/e-shell.h" #include "shell/e-shell-window.h" -#include "widgets/misc/e-book-source-config.h" -#include "widgets/misc/e-preferences-window.h" -#include "widgets/misc/e-source-config-dialog.h" #include "addressbook/gui/widgets/eab-gui-util.h" #include "addressbook/gui/contact-editor/e-contact-editor.h" diff --git a/modules/addressbook/e-book-shell-content.c b/modules/addressbook/e-book-shell-content.c index 84c8b31699..26b370f6d6 100644 --- a/modules/addressbook/e-book-shell-content.c +++ b/modules/addressbook/e-book-shell-content.c @@ -27,10 +27,7 @@ #include <glib/gi18n.h> -#include "e-util/e-selection.h" #include "shell/e-shell-utils.h" -#include "widgets/misc/e-paned.h" -#include "widgets/misc/e-preview-pane.h" #include "e-book-shell-view.h" #define E_BOOK_SHELL_CONTENT_GET_PRIVATE(obj) \ diff --git a/modules/addressbook/e-book-shell-content.h b/modules/addressbook/e-book-shell-content.h index 63c395cab7..b0258d82ae 100644 --- a/modules/addressbook/e-book-shell-content.h +++ b/modules/addressbook/e-book-shell-content.h @@ -28,8 +28,6 @@ #include <shell/e-shell-searchbar.h> #include <shell/e-shell-view.h> -#include <misc/e-preview-pane.h> - #include "addressbook/gui/widgets/e-addressbook-view.h" #include "eab-composer-util.h" diff --git a/modules/addressbook/e-book-shell-sidebar.h b/modules/addressbook/e-book-shell-sidebar.h index d2bac8ca97..703d67cb0c 100644 --- a/modules/addressbook/e-book-shell-sidebar.h +++ b/modules/addressbook/e-book-shell-sidebar.h @@ -22,8 +22,6 @@ #ifndef E_BOOK_SHELL_SIDEBAR_H #define E_BOOK_SHELL_SIDEBAR_H -#include <libedataserverui/libedataserverui.h> - #include <shell/e-shell-sidebar.h> #include <shell/e-shell-view.h> diff --git a/modules/addressbook/e-book-shell-view-actions.c b/modules/addressbook/e-book-shell-view-actions.c index 54865b7e39..01064f2da6 100644 --- a/modules/addressbook/e-book-shell-view-actions.c +++ b/modules/addressbook/e-book-shell-view-actions.c @@ -25,13 +25,7 @@ #include "e-book-shell-view-private.h" -#include <libevolution-utils/e-alert-dialog.h> #include <e-util/e-util.h> -#include <filter/e-filter-rule.h> - -#ifdef WITH_CONTACT_MAPS -#include <widgets/misc/e-contact-map-window.h> -#endif static void action_address_book_copy_cb (GtkAction *action, diff --git a/modules/addressbook/e-book-shell-view-private.c b/modules/addressbook/e-book-shell-view-private.c index 947f680f6e..884477f451 100644 --- a/modules/addressbook/e-book-shell-view-private.c +++ b/modules/addressbook/e-book-shell-view-private.c @@ -27,7 +27,6 @@ #include "e-book-shell-view-private.h" -#include "widgets/menus/gal-view-factory-etable.h" #include "addressbook/gui/widgets/gal-view-factory-minicard.h" static void diff --git a/modules/addressbook/e-book-shell-view-private.h b/modules/addressbook/e-book-shell-view-private.h index 8338476f5e..8aa12d157d 100644 --- a/modules/addressbook/e-book-shell-view-private.h +++ b/modules/addressbook/e-book-shell-view-private.h @@ -28,18 +28,11 @@ #include <glib/gi18n.h> #include <gdk/gdkkeysyms.h> #include <libebook/libebook.h> -#include <libedataserverui/libedataserverui.h> -#include "e-util/e-util.h" -#include "e-util/e-file-utils.h" #include "shell/e-shell-content.h" #include "shell/e-shell-searchbar.h" #include "shell/e-shell-sidebar.h" #include "shell/e-shell-utils.h" -#include "misc/e-book-source-config.h" -#include "misc/e-popup-action.h" -#include "misc/e-selectable.h" -#include "misc/e-source-config-dialog.h" #include "addressbook/util/eab-book-util.h" #include "addressbook/gui/contact-editor/e-contact-editor.h" |