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 | |
| parent | b61331ed03ac1c7a9b8614e25510040b9c60ae02 (diff) | |
| download | gsoc2013-evolution-d09d8de870b6697c8a8b262e7e077b871a69b315.tar gsoc2013-evolution-d09d8de870b6697c8a8b262e7e077b871a69b315.tar.gz gsoc2013-evolution-d09d8de870b6697c8a8b262e7e077b871a69b315.tar.bz2 gsoc2013-evolution-d09d8de870b6697c8a8b262e7e077b871a69b315.tar.lz gsoc2013-evolution-d09d8de870b6697c8a8b262e7e077b871a69b315.tar.xz 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')
136 files changed, 208 insertions, 385 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" diff --git a/modules/audio-inline/Makefile.am b/modules/audio-inline/Makefile.am index 64af11c1af..147379f7b2 100644 --- a/modules/audio-inline/Makefile.am +++ b/modules/audio-inline/Makefile.am @@ -3,11 +3,12 @@ module_LTLIBRARIES = module-audio-inline.la module_audio_inline_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ -DG_LOG_DOMAIN=\"evolution-module-audio-inline\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) \ $(GSTREAMER_CFLAGS) module_audio_inline_la_SOURCES = \ @@ -24,6 +25,8 @@ module_audio_inline_la_LIBADD = \ $(top_builddir)/em-format/libemformat.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) \ $(GSTREAMER_LIBS) module_audio_inline_la_LDFLAGS = \ diff --git a/modules/audio-inline/e-mail-formatter-audio-inline.c b/modules/audio-inline/e-mail-formatter-audio-inline.c index cf31f1596d..86cd6f132f 100644 --- a/modules/audio-inline/e-mail-formatter-audio-inline.c +++ b/modules/audio-inline/e-mail-formatter-audio-inline.c @@ -24,16 +24,14 @@ #include <glib/gi18n-lib.h> +#include <camel/camel.h> +#include <gst/gst.h> + #include <libebackend/libebackend.h> #include <em-format/e-mail-formatter-extension.h> #include <em-format/e-mail-formatter.h> -#include "e-util/e-mktemp.h" - -#include <camel/camel.h> -#include <gst/gst.h> - #include "e-mail-part-audio-inline.h" #define d(x) diff --git a/modules/backup-restore/Makefile.am b/modules/backup-restore/Makefile.am index 7d952e795e..4b5970764c 100644 --- a/modules/backup-restore/Makefile.am +++ b/modules/backup-restore/Makefile.am @@ -5,7 +5,6 @@ module_LTLIBRARIES = module-backup-restore.la module_backup_restore_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -DG_LOG_DOMAIN=\"evolution-backup-restore\" \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\" \ @@ -15,6 +14,7 @@ module_backup_restore_la_CPPFLAGS = \ -DLIBDIR=\""$(libdir)"\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) \ $(NULL) @@ -30,11 +30,10 @@ module_backup_restore_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/mail/libevolution-mail.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ - $(top_builddir)/libevolution-utils/libevolution-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) \ $(NULL) @@ -46,7 +45,6 @@ privlibexec_PROGRAMS = evolution-backup evolution_backup_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\" \ -DPREFIX=\""$(prefix)"\" \ @@ -56,6 +54,8 @@ evolution_backup_CPPFLAGS = \ -DDBUS_SERVICES_DIR=\"'${datadir}'/dbus-1/services\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) \ $(NULL) evolution_backup_SOURCES = \ @@ -66,6 +66,8 @@ evolution_backup_LDADD = \ $(top_builddir)/e-util/libeutil.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) \ $(NULL) if OS_WIN32 diff --git a/modules/backup-restore/e-mail-config-restore-page.c b/modules/backup-restore/e-mail-config-restore-page.c index 7a997661e3..33b192c87a 100644 --- a/modules/backup-restore/e-mail-config-restore-page.c +++ b/modules/backup-restore/e-mail-config-restore-page.c @@ -27,9 +27,7 @@ #endif #include <glib/gi18n-lib.h> -#include <libevolution-utils/e-alert-sink.h> -#include <libevolution-utils/e-alert-dialog.h> -#include <misc/e-alert-bar.h> +#include <e-util/e-util.h> #define E_MAIL_CONFIG_RESTORE_PAGE_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ diff --git a/modules/backup-restore/evolution-backup-restore.c b/modules/backup-restore/evolution-backup-restore.c index 925315b8af..01028e53f7 100644 --- a/modules/backup-restore/evolution-backup-restore.c +++ b/modules/backup-restore/evolution-backup-restore.c @@ -30,13 +30,13 @@ #include <libebackend/libebackend.h> -#include <mail/e-mail-config-assistant.h> -#include <libevolution-utils/e-alert-dialog.h> #include <e-util/e-util.h> -#include <e-util/e-dialog-utils.h> + #include <shell/e-shell-utils.h> #include <shell/e-shell-window.h> +#include <mail/e-mail-config-assistant.h> + #include "e-mail-config-restore-page.h" #include "e-mail-config-restore-ready-page.h" diff --git a/modules/bogofilter/Makefile.am b/modules/bogofilter/Makefile.am index aaa72f977d..a3e3019bce 100644 --- a/modules/bogofilter/Makefile.am +++ b/modules/bogofilter/Makefile.am @@ -15,7 +15,6 @@ module_bogofilter_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ - $(top_builddir)/libemail-utils/libemail-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) diff --git a/modules/book-config-google/Makefile.am b/modules/book-config-google/Makefile.am index edf8789aac..b1f8d7135e 100644 --- a/modules/book-config-google/Makefile.am +++ b/modules/book-config-google/Makefile.am @@ -3,19 +3,21 @@ module_LTLIBRARIES = module-book-config-google.la module_book_config_google_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -DG_LOG_DOMAIN=\"evolution-book-config-google\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ - $(GNOME_PLATFORM_CFLAGS) + $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) module_book_config_google_la_SOURCES = \ evolution-book-config-google.c module_book_config_google_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) module_book_config_google_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) diff --git a/modules/book-config-google/evolution-book-config-google.c b/modules/book-config-google/evolution-book-config-google.c index e097c0a2cd..709a6f3112 100644 --- a/modules/book-config-google/evolution-book-config-google.c +++ b/modules/book-config-google/evolution-book-config-google.c @@ -21,9 +21,7 @@ #include <libebackend/libebackend.h> -#include <misc/e-book-source-config.h> -#include <misc/e-interval-chooser.h> -#include <misc/e-source-config-backend.h> +#include <e-util/e-util.h> typedef ESourceConfigBackend EBookConfigGoogle; typedef ESourceConfigBackendClass EBookConfigGoogleClass; diff --git a/modules/book-config-ldap/Makefile.am b/modules/book-config-ldap/Makefile.am index 6e957dc8c5..df17cb358c 100644 --- a/modules/book-config-ldap/Makefile.am +++ b/modules/book-config-ldap/Makefile.am @@ -3,10 +3,11 @@ module_LTLIBRARIES = module-book-config-ldap.la module_book_config_ldap_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -DG_LOG_DOMAIN=\"evolution-book-config-ldap\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) \ $(LDAP_CFLAGS) module_book_config_ldap_la_SOURCES = \ @@ -15,11 +16,11 @@ module_book_config_ldap_la_SOURCES = \ e-source-ldap.h module_book_config_ldap_la_LIBADD = \ - $(top_builddir)/libevolution-utils/libevolution-utils.la \ $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) \ $(LDAP_LIBS) module_book_config_ldap_la_LDFLAGS = \ diff --git a/modules/book-config-ldap/evolution-book-config-ldap.c b/modules/book-config-ldap/evolution-book-config-ldap.c index 42cea3b5d5..56fc0f24f6 100644 --- a/modules/book-config-ldap/evolution-book-config-ldap.c +++ b/modules/book-config-ldap/evolution-book-config-ldap.c @@ -22,9 +22,7 @@ #include <libebackend/libebackend.h> -#include <libevolution-utils/e-alert-dialog.h> -#include <misc/e-book-source-config.h> -#include <misc/e-source-config-backend.h> +#include <e-util/e-util.h> #include "e-source-ldap.h" diff --git a/modules/book-config-local/Makefile.am b/modules/book-config-local/Makefile.am index 518ea3b52e..eca745d804 100644 --- a/modules/book-config-local/Makefile.am +++ b/modules/book-config-local/Makefile.am @@ -3,19 +3,21 @@ module_LTLIBRARIES = module-book-config-local.la module_book_config_local_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -DG_LOG_DOMAIN=\"evolution-book-config-local\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ - $(GNOME_PLATFORM_CFLAGS) + $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) module_book_config_local_la_SOURCES = \ evolution-book-config-local.c module_book_config_local_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) module_book_config_local_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) diff --git a/modules/book-config-local/evolution-book-config-local.c b/modules/book-config-local/evolution-book-config-local.c index b6c31a7ed8..2726b84b33 100644 --- a/modules/book-config-local/evolution-book-config-local.c +++ b/modules/book-config-local/evolution-book-config-local.c @@ -21,8 +21,7 @@ #include <libebackend/libebackend.h> -#include <misc/e-book-source-config.h> -#include <misc/e-source-config-backend.h> +#include <e-util/e-util.h> typedef ESourceConfigBackend EBookConfigLocal; typedef ESourceConfigBackendClass EBookConfigLocalClass; diff --git a/modules/book-config-webdav/Makefile.am b/modules/book-config-webdav/Makefile.am index 5f3f09cbd6..5c919cc049 100644 --- a/modules/book-config-webdav/Makefile.am +++ b/modules/book-config-webdav/Makefile.am @@ -3,19 +3,21 @@ module_LTLIBRARIES = module-book-config-webdav.la module_book_config_webdav_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -DG_LOG_DOMAIN=\"evolution-book-config-webdav\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ - $(GNOME_PLATFORM_CFLAGS) + $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) module_book_config_webdav_la_SOURCES = \ evolution-book-config-webdav.c module_book_config_webdav_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) module_book_config_webdav_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) diff --git a/modules/book-config-webdav/evolution-book-config-webdav.c b/modules/book-config-webdav/evolution-book-config-webdav.c index 6b6b1b47f2..418de91796 100644 --- a/modules/book-config-webdav/evolution-book-config-webdav.c +++ b/modules/book-config-webdav/evolution-book-config-webdav.c @@ -21,8 +21,7 @@ #include <libebackend/libebackend.h> -#include <misc/e-book-source-config.h> -#include <misc/e-source-config-backend.h> +#include <e-util/e-util.h> typedef ESourceConfigBackend EBookConfigWebdav; typedef ESourceConfigBackendClass EBookConfigWebdavClass; diff --git a/modules/cal-config-caldav/Makefile.am b/modules/cal-config-caldav/Makefile.am index 6905aff473..51a2b58307 100644 --- a/modules/cal-config-caldav/Makefile.am +++ b/modules/cal-config-caldav/Makefile.am @@ -3,10 +3,11 @@ module_LTLIBRARIES = module-cal-config-caldav.la module_cal_config_caldav_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -DG_LOG_DOMAIN=\"evolution-cal-config-caldav\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) \ $(LIBSOUP_CFLAGS) module_cal_config_caldav_la_SOURCES = \ @@ -18,9 +19,10 @@ module_cal_config_caldav_la_SOURCES = \ module_cal_config_caldav_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) \ $(LIBSOUP_LIBS) module_cal_config_caldav_la_LDFLAGS = \ diff --git a/modules/cal-config-caldav/e-caldav-chooser.c b/modules/cal-config-caldav/e-caldav-chooser.c index b9176c4143..8bb5fae8a9 100644 --- a/modules/cal-config-caldav/e-caldav-chooser.c +++ b/modules/cal-config-caldav/e-caldav-chooser.c @@ -28,7 +28,7 @@ #include <libxml/xpath.h> #include <libxml/xpathInternals.h> -#include <libedataserverui/libedataserverui.h> +#include <e-util/e-util.h> #define E_CALDAV_CHOOSER_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ diff --git a/modules/cal-config-caldav/evolution-cal-config-caldav.c b/modules/cal-config-caldav/evolution-cal-config-caldav.c index 0ca90cb5e6..249892eb5e 100644 --- a/modules/cal-config-caldav/evolution-cal-config-caldav.c +++ b/modules/cal-config-caldav/evolution-cal-config-caldav.c @@ -21,9 +21,7 @@ #include <libebackend/libebackend.h> -#include <misc/e-cal-source-config.h> -#include <misc/e-interval-chooser.h> -#include <misc/e-source-config-backend.h> +#include <e-util/e-util.h> #include "e-caldav-chooser.h" #include "e-caldav-chooser-dialog.h" diff --git a/modules/cal-config-contacts/Makefile.am b/modules/cal-config-contacts/Makefile.am index d27d3a06c0..166773a521 100644 --- a/modules/cal-config-contacts/Makefile.am +++ b/modules/cal-config-contacts/Makefile.am @@ -3,10 +3,11 @@ module_LTLIBRARIES = module-cal-config-contacts.la module_cal_config_contacts_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -DG_LOG_DOMAIN=\"evolution-cal-config-contacts\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ - $(GNOME_PLATFORM_CFLAGS) + $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) module_cal_config_contacts_la_SOURCES = \ evolution-cal-config-contacts.c \ @@ -17,9 +18,10 @@ module_cal_config_contacts_la_SOURCES = \ module_cal_config_contacts_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) module_cal_config_contacts_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) diff --git a/modules/cal-config-contacts/e-contacts-selector.h b/modules/cal-config-contacts/e-contacts-selector.h index 5ba1ea9dca..7d567cd4ae 100644 --- a/modules/cal-config-contacts/e-contacts-selector.h +++ b/modules/cal-config-contacts/e-contacts-selector.h @@ -19,7 +19,7 @@ #ifndef E_CONTACTS_SELECTOR_H #define E_CONTACTS_SELECTOR_H -#include <libedataserverui/libedataserverui.h> +#include <e-util/e-util.h> /* Standard GObject macros */ #define E_TYPE_CONTACTS_SELECTOR \ diff --git a/modules/cal-config-contacts/evolution-cal-config-contacts.c b/modules/cal-config-contacts/evolution-cal-config-contacts.c index 5efc8b04e8..e61d6afbec 100644 --- a/modules/cal-config-contacts/evolution-cal-config-contacts.c +++ b/modules/cal-config-contacts/evolution-cal-config-contacts.c @@ -21,9 +21,7 @@ #include <libebackend/libebackend.h> -#include <misc/e-cal-source-config.h> -#include <misc/e-book-source-config.h> -#include <misc/e-source-config-backend.h> +#include <e-util/e-util.h> #include "e-contacts-selector.h" #include "e-source-contacts.h" diff --git a/modules/cal-config-google/Makefile.am b/modules/cal-config-google/Makefile.am index 6467c436f0..3477c61a83 100644 --- a/modules/cal-config-google/Makefile.am +++ b/modules/cal-config-google/Makefile.am @@ -3,10 +3,11 @@ module_LTLIBRARIES = module-cal-config-google.la module_cal_config_google_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -DG_LOG_DOMAIN=\"evolution-cal-config-google\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) \ $(GDATA_CFLAGS) module_cal_config_google_la_SOURCES = \ @@ -20,9 +21,10 @@ module_cal_config_google_la_SOURCES = \ module_cal_config_google_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) \ $(GDATA_LIBS) module_cal_config_google_la_LDFLAGS = \ diff --git a/modules/cal-config-google/e-google-chooser.c b/modules/cal-config-google/e-google-chooser.c index 9dd2b326e7..d03c5dce8f 100644 --- a/modules/cal-config-google/e-google-chooser.c +++ b/modules/cal-config-google/e-google-chooser.c @@ -23,7 +23,7 @@ #include <gdata/gdata.h> #include <glib/gi18n-lib.h> -#include <libedataserverui/libedataserverui.h> +#include <e-util/e-util.h> #define E_GOOGLE_CHOOSER_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ diff --git a/modules/cal-config-google/evolution-cal-config-google.c b/modules/cal-config-google/evolution-cal-config-google.c index 2447e70b8a..97b4c7eeea 100644 --- a/modules/cal-config-google/evolution-cal-config-google.c +++ b/modules/cal-config-google/evolution-cal-config-google.c @@ -21,8 +21,7 @@ #include <libebackend/libebackend.h> -#include <misc/e-cal-source-config.h> -#include <misc/e-source-config-backend.h> +#include <e-util/e-util.h> #include "e-google-chooser-button.h" #include "e-google-chooser-dialog.h" diff --git a/modules/cal-config-local/Makefile.am b/modules/cal-config-local/Makefile.am index 477d31b7eb..84a478dfaf 100644 --- a/modules/cal-config-local/Makefile.am +++ b/modules/cal-config-local/Makefile.am @@ -3,10 +3,11 @@ module_LTLIBRARIES = module-cal-config-local.la module_cal_config_local_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -DG_LOG_DOMAIN=\"evolution-cal-config-local\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ - $(GNOME_PLATFORM_CFLAGS) + $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) module_cal_config_local_la_SOURCES = \ evolution-cal-config-local.c \ @@ -15,9 +16,10 @@ module_cal_config_local_la_SOURCES = \ module_cal_config_local_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) module_cal_config_local_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) diff --git a/modules/cal-config-local/evolution-cal-config-local.c b/modules/cal-config-local/evolution-cal-config-local.c index 2e1200ae02..13b066e742 100644 --- a/modules/cal-config-local/evolution-cal-config-local.c +++ b/modules/cal-config-local/evolution-cal-config-local.c @@ -21,8 +21,7 @@ #include <libebackend/libebackend.h> -#include <misc/e-cal-source-config.h> -#include <misc/e-source-config-backend.h> +#include <e-util/e-util.h> #include "e-source-local.h" diff --git a/modules/cal-config-weather/Makefile.am b/modules/cal-config-weather/Makefile.am index 7276a9d2c0..ef72e26f0c 100644 --- a/modules/cal-config-weather/Makefile.am +++ b/modules/cal-config-weather/Makefile.am @@ -3,10 +3,11 @@ module_LTLIBRARIES = module-cal-config-weather.la module_cal_config_weather_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -DG_LOG_DOMAIN=\"evolution-cal-config-weather\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) \ $(GWEATHER_CFLAGS) module_cal_config_weather_la_SOURCES = \ @@ -16,9 +17,10 @@ module_cal_config_weather_la_SOURCES = \ module_cal_config_weather_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) \ $(GWEATHER_LIBS) module_cal_config_weather_la_LDFLAGS = \ diff --git a/modules/cal-config-weather/evolution-cal-config-weather.c b/modules/cal-config-weather/evolution-cal-config-weather.c index d5a4e2ca8d..2e5532e5c8 100644 --- a/modules/cal-config-weather/evolution-cal-config-weather.c +++ b/modules/cal-config-weather/evolution-cal-config-weather.c @@ -25,8 +25,7 @@ #include <libgweather/location-entry.h> #undef GWEATHER_I_KNOW_THIS_IS_UNSTABLE -#include <misc/e-cal-source-config.h> -#include <misc/e-source-config-backend.h> +#include <e-util/e-util.h> #include "e-source-weather.h" diff --git a/modules/cal-config-webcal/Makefile.am b/modules/cal-config-webcal/Makefile.am index 29f9cf27a5..aedc04b66f 100644 --- a/modules/cal-config-webcal/Makefile.am +++ b/modules/cal-config-webcal/Makefile.am @@ -3,19 +3,21 @@ module_LTLIBRARIES = module-cal-config-webcal.la module_cal_config_webcal_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -DG_LOG_DOMAIN=\"evolution-cal-config-webcal\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ - $(GNOME_PLATFORM_CFLAGS) + $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) module_cal_config_webcal_la_SOURCES = \ evolution-cal-config-webcal.c module_cal_config_webcal_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) module_cal_config_webcal_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) diff --git a/modules/cal-config-webcal/evolution-cal-config-webcal.c b/modules/cal-config-webcal/evolution-cal-config-webcal.c index 70eb06caf5..82a40ee923 100644 --- a/modules/cal-config-webcal/evolution-cal-config-webcal.c +++ b/modules/cal-config-webcal/evolution-cal-config-webcal.c @@ -21,9 +21,7 @@ #include <libebackend/libebackend.h> -#include <misc/e-cal-source-config.h> -#include <misc/e-interval-chooser.h> -#include <misc/e-source-config-backend.h> +#include <e-util/e-util.h> typedef ESourceConfigBackend ECalConfigWebcal; typedef ESourceConfigBackendClass ECalConfigWebcalClass; 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 <libical/ical.h> #include <camel/camel.h> #include <libecal/libecal.h> -#include <libedataserverui/libedataserverui.h> #include <shell/e-shell.h> 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 <misc/e-attachment-handler.h> +#include <e-util/e-util.h> /* 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 <shell/e-shell.h> -#include <misc/e-calendar-item.h> #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 <shell/e-shell.h> -#include <misc/e-dateedit.h> #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 <string.h> #include <glib/gi18n.h> #include <libecal/libecal.h> -#include <libedataserverui/libedataserverui.h> -#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 <string.h> #include <glib/gi18n.h> -#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 <calendar/gui/e-memo-table.h> #include <calendar/gui/e-task-table.h> #include <calendar/gui/gnome-cal.h> -#include <menus/gal-view-instance.h> /* 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 <string.h> #include <glib/gi18n.h> -#include <libedataserverui/libedataserverui.h> - -#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 <libecal/libecal.h> -#include <libedataserverui/libedataserverui.h> #include <shell/e-shell-sidebar.h> #include <shell/e-shell-view.h> -#include <misc/e-calendar.h> /* 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 <config.h> #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 <glib/gi18n.h> #include <libecal/libecal.h> -#include <libedataserverui/libedataserverui.h> - -#include <e-util/e-selection.h> -#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> #include <calendar/gui/e-cal-list-view.h> 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 <libedataserverui/libedataserverui.h> - #include <shell/e-shell.h> -#include <widgets/misc/e-preferences-window.h> /* 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 <string.h> #include <glib/gi18n.h> #include <libecal/libecal.h> -#include <libedataserverui/libedataserverui.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-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 <glib/gi18n.h> -#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 <calendar/gui/e-memo-table.h> -#include <menus/gal-view-instance.h> -#include <misc/e-preview-pane.h> - /* 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 <string.h> #include <glib/gi18n.h> -#include <libedataserverui/libedataserverui.h> -#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 <libecal/libecal.h> -#include <libedataserverui/libedataserverui.h> #include <shell/e-shell-sidebar.h> #include <shell/e-shell-view.h> 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 <config.h> #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 <string.h> #include <glib/gi18n.h> -#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 <string.h> #include <glib/gi18n.h> #include <libecal/libecal.h> -#include <libedataserverui/libedataserverui.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-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 <glib/gi18n.h> -#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 <calendar/gui/e-cal-model.h> #include <calendar/gui/e-task-table.h> -#include <menus/gal-view-instance.h> -#include <misc/e-preview-pane.h> - /* 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 <string.h> #include <glib/gi18n.h> -#include <libedataserverui/libedataserverui.h> -#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 <libecal/libecal.h> -#include <libedataserverui/libedataserverui.h> #include <shell/e-shell-sidebar.h> #include <shell/e-shell-view.h> 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 <config.h> #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 <string.h> #include <glib/gi18n.h> #include <libecal/libecal.h> -#include <libedataserverui/libedataserverui.h> -#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" diff --git a/modules/composer-autosave/Makefile.am b/modules/composer-autosave/Makefile.am index 3f62e4c05c..b1175a5e75 100644 --- a/modules/composer-autosave/Makefile.am +++ b/modules/composer-autosave/Makefile.am @@ -3,10 +3,10 @@ module_LTLIBRARIES = module-composer-autosave.la module_composer_autosave_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -DG_LOG_DOMAIN=\"evolution-composer-autosave\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) module_composer_autosave_la_SOURCES = \ @@ -19,11 +19,10 @@ module_composer_autosave_la_SOURCES = \ module_composer_autosave_la_LIBADD = \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/composer/libcomposer.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/libevolution-utils/libevolution-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) module_composer_autosave_la_LDFLAGS = \ diff --git a/modules/composer-autosave/e-composer-autosave.c b/modules/composer-autosave/e-composer-autosave.c index e24b1640c0..cf0dd3b94a 100644 --- a/modules/composer-autosave/e-composer-autosave.c +++ b/modules/composer-autosave/e-composer-autosave.c @@ -22,7 +22,6 @@ #include <libebackend/libebackend.h> -#include <libevolution-utils/e-alert-dialog.h> #include <composer/e-msg-composer.h> #include "e-autosave-utils.h" diff --git a/modules/composer-autosave/e-composer-registry.c b/modules/composer-autosave/e-composer-registry.c index 76736c8fe6..bd4bb933dd 100644 --- a/modules/composer-autosave/e-composer-registry.c +++ b/modules/composer-autosave/e-composer-registry.c @@ -25,7 +25,6 @@ #include <shell/e-shell.h> #include <shell/e-shell-window.h> -#include <libevolution-utils/e-alert-dialog.h> #include <composer/e-msg-composer.h> #include "e-autosave-utils.h" diff --git a/modules/imap-features/Makefile.am b/modules/imap-features/Makefile.am index d49ddfa287..b88161cd84 100644 --- a/modules/imap-features/Makefile.am +++ b/modules/imap-features/Makefile.am @@ -5,10 +5,11 @@ module_LTLIBRARIES = module-imap-features.la module_imap_features_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -DG_LOG_DOMAIN=\"evolution-imap-features\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) \ $(NULL) module_imap_features_la_SOURCES = \ @@ -21,10 +22,11 @@ module_imap_features_la_SOURCES = \ module_imap_features_la_LIBADD = \ $(top_builddir)/mail/libevolution-mail.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) \ $(NULL) module_imap_features_la_LDFLAGS = \ diff --git a/modules/itip-formatter/Makefile.am b/modules/itip-formatter/Makefile.am index 76464ca455..596cc6a39b 100644 --- a/modules/itip-formatter/Makefile.am +++ b/modules/itip-formatter/Makefile.am @@ -7,11 +7,12 @@ module_LTLIBRARIES = module-itip-formatter.la module_itip_formatter_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ -DG_LOG_DOMAIN=\"evolution-module-itip-formatter\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ - $(GNOME_PLATFORM_CFLAGS) + $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) module_itip_formatter_la_SOURCES = \ e-conflict-search-selector.c \ @@ -33,12 +34,11 @@ module_itip_formatter_la_LIBADD = \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/em-format/libemformat.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(top_builddir)/libemail-utils/libemail-utils.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ - $(top_builddir)/libevolution-utils/libevolution-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) module_itip_formatter_la_LDFLAGS = \ -avoid-version -module $(NO_UNDEFINED) diff --git a/modules/itip-formatter/e-conflict-search-selector.h b/modules/itip-formatter/e-conflict-search-selector.h index 091e1c9328..bcd3ce195f 100644 --- a/modules/itip-formatter/e-conflict-search-selector.h +++ b/modules/itip-formatter/e-conflict-search-selector.h @@ -19,7 +19,7 @@ #ifndef E_CONFLICT_SEARCH_SELECTOR_H #define E_CONFLICT_SEARCH_SELECTOR_H -#include <libedataserverui/libedataserverui.h> +#include <e-util/e-util.h> /* Standard GObject macros */ #define E_TYPE_CONFLICT_SEARCH_SELECTOR \ diff --git a/modules/itip-formatter/e-mail-parser-itip.c b/modules/itip-formatter/e-mail-parser-itip.c index d0ab563dcc..9e5ff46e45 100644 --- a/modules/itip-formatter/e-mail-parser-itip.c +++ b/modules/itip-formatter/e-mail-parser-itip.c @@ -30,15 +30,14 @@ #include "e-mail-parser-itip.h" +#include <shell/e-shell.h> + #include <em-format/e-mail-extension-registry.h> #include <em-format/e-mail-parser-extension.h> #include <em-format/e-mail-part.h> -#include <misc/e-attachment.h> - #include "e-mail-part-itip.h" #include "itip-view.h" -#include <shell/e-shell.h> #define CONF_KEY_DELETE "delete-processed" diff --git a/modules/itip-formatter/e-mail-part-itip.h b/modules/itip-formatter/e-mail-part-itip.h index d2e681b467..7a9cbd7830 100644 --- a/modules/itip-formatter/e-mail-part-itip.h +++ b/modules/itip-formatter/e-mail-part-itip.h @@ -22,7 +22,6 @@ #endif #include <libecal/libecal.h> -#include <libedataserverui/libedataserverui.h> #include <libebackend/libebackend.h> #include <em-format/e-mail-part.h> diff --git a/modules/itip-formatter/itip-view.c b/modules/itip-formatter/itip-view.c index f155e7295f..1ee2dffe98 100644 --- a/modules/itip-formatter/itip-view.c +++ b/modules/itip-formatter/itip-view.c @@ -26,23 +26,16 @@ #include <string.h> #include <glib/gi18n.h> -#include <libedataserverui/libedataserverui.h> -#include <libedataserver/libedataserver.h> - -#include <e-util/e-util.h> -#include <e-util/e-unicode.h> -#include <calendar/gui/itip-utils.h> #include <webkit/webkitdom.h> - -#include <libevolution-utils/e-alert-dialog.h> -#include <e-util/e-mktemp.h> +#include <libedataserver/libedataserver.h> #include <shell/e-shell.h> #include <shell/e-shell-utils.h> -#include <libemail-utils/mail-mt.h> +#include <calendar/gui/itip-utils.h> #include <libemail-engine/mail-folder-cache.h> +#include <libemail-engine/mail-mt.h> #include <libemail-engine/mail-tools.h> #include <mail/em-config.h> diff --git a/modules/itip-formatter/plugin/Makefile.am b/modules/itip-formatter/plugin/Makefile.am index 31c886a264..6777219944 100644 --- a/modules/itip-formatter/plugin/Makefile.am +++ b/modules/itip-formatter/plugin/Makefile.am @@ -6,11 +6,12 @@ plugin_LTLIBRARIES = liborg-gnome-itip-formatter.la liborg_gnome_itip_formatter_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -I$(top_srcdir)/modules/itip-formatter \ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ - $(GNOME_PLATFORM_CFLAGS) + $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) liborg_gnome_itip_formatter_la_SOURCES = \ config-ui.c \ @@ -27,9 +28,10 @@ liborg_gnome_itip_formatter_la_LIBADD = \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/em-format/libemformat.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) BUILT_SOURCES = $(plugin_DATA) diff --git a/modules/mail-config/Makefile.am b/modules/mail-config/Makefile.am index 1efd510c42..e42e3a2a08 100644 --- a/modules/mail-config/Makefile.am +++ b/modules/mail-config/Makefile.am @@ -5,10 +5,11 @@ module_LTLIBRARIES = module-mail-config.la module_mail_config_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -DG_LOG_DOMAIN=\"evolution-mail-config\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) \ $(NULL) module_mail_config_la_SOURCES = \ @@ -26,11 +27,13 @@ module_mail_config_la_SOURCES = \ $(NULL) module_mail_config_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/mail/libevolution-mail.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) \ $(NULL) module_mail_config_la_LDFLAGS = \ diff --git a/modules/mail-config/e-mail-config-remote-accounts.c b/modules/mail-config/e-mail-config-remote-accounts.c index 491db0207f..aac3edeb03 100644 --- a/modules/mail-config/e-mail-config-remote-accounts.c +++ b/modules/mail-config/e-mail-config-remote-accounts.c @@ -22,8 +22,6 @@ #include <camel/camel.h> #include <libebackend/libebackend.h> -#include <misc/e-port-entry.h> - #include <mail/e-mail-config-auth-check.h> #include <mail/e-mail-config-service-page.h> diff --git a/modules/mail-config/e-mail-config-smtp-backend.c b/modules/mail-config/e-mail-config-smtp-backend.c index fe992b3507..ac54cd4148 100644 --- a/modules/mail-config/e-mail-config-smtp-backend.c +++ b/modules/mail-config/e-mail-config-smtp-backend.c @@ -24,8 +24,6 @@ #include <camel/camel.h> #include <libebackend/libebackend.h> -#include <misc/e-port-entry.h> - #include <mail/e-mail-config-auth-check.h> #include <mail/e-mail-config-service-page.h> 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 \ diff --git a/modules/mailto-handler/Makefile.am b/modules/mailto-handler/Makefile.am index e33a120a47..c7bfe3ae2d 100644 --- a/modules/mailto-handler/Makefile.am +++ b/modules/mailto-handler/Makefile.am @@ -6,6 +6,7 @@ module_mailto_handler_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-mailto-handler\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) module_mailto_handler_la_SOURCES = \ @@ -16,6 +17,7 @@ module_mailto_handler_la_LIBADD = \ $(top_builddir)/shell/libeshell.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) module_mailto_handler_la_LDFLAGS = \ diff --git a/modules/mdn/Makefile.am b/modules/mdn/Makefile.am index bd6cbb9eb6..df5e539f56 100644 --- a/modules/mdn/Makefile.am +++ b/modules/mdn/Makefile.am @@ -3,10 +3,10 @@ module_LTLIBRARIES = module-mdn.la module_mdn_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -DG_LOG_DOMAIN=\"evolution-mdn\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) module_mdn_la_SOURCES = \ @@ -17,9 +17,9 @@ module_mdn_la_LIBADD = \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ - $(top_builddir)/libevolution-utils/libevolution-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) module_mdn_la_LDFLAGS = \ diff --git a/modules/mdn/evolution-mdn.c b/modules/mdn/evolution-mdn.c index 5b32cd0cba..441b063dc1 100644 --- a/modules/mdn/evolution-mdn.c +++ b/modules/mdn/evolution-mdn.c @@ -22,8 +22,6 @@ #include <libebackend/libebackend.h> -#include <libevolution-utils/e-alert-dialog.h> - #include <libemail-engine/e-mail-session-utils.h> #include <mail/em-utils.h> diff --git a/modules/offline-alert/Makefile.am b/modules/offline-alert/Makefile.am index 9673a2778d..d8e9906b7b 100644 --- a/modules/offline-alert/Makefile.am +++ b/modules/offline-alert/Makefile.am @@ -3,10 +3,11 @@ module_LTLIBRARIES = module-offline-alert.la module_offline_alert_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -DG_LOG_DOMAIN=\"evolution-offline-alert\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ - $(GNOME_PLATFORM_CFLAGS) + $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) module_offline_alert_la_SOURCES = \ evolution-offline-alert.c @@ -14,9 +15,10 @@ module_offline_alert_la_SOURCES = \ module_offline_alert_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ - $(top_builddir)/libevolution-utils/libevolution-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) module_offline_alert_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) diff --git a/modules/offline-alert/evolution-offline-alert.c b/modules/offline-alert/evolution-offline-alert.c index 3a600c093e..767f41a757 100644 --- a/modules/offline-alert/evolution-offline-alert.c +++ b/modules/offline-alert/evolution-offline-alert.c @@ -24,7 +24,6 @@ #include <shell/e-shell-view.h> #include <shell/e-shell-window-actions.h> -#include <libevolution-utils/e-alert-sink.h> /* Standard GObject macros */ #define E_TYPE_OFFLINE_ALERT \ diff --git a/modules/online-accounts/Makefile.am b/modules/online-accounts/Makefile.am index d12fd08d03..846e5cd44d 100644 --- a/modules/online-accounts/Makefile.am +++ b/modules/online-accounts/Makefile.am @@ -8,6 +8,8 @@ module_online_accounts_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-online-accounts\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) \ $(GOA_CFLAGS) \ $(NULL) @@ -23,9 +25,10 @@ module_online_accounts_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ - $(top_builddir)/libemail-utils/libemail-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) \ $(GOA_LIBS) \ $(NULL) diff --git a/modules/plugin-lib/Makefile.am b/modules/plugin-lib/Makefile.am index 0933861156..950e472560 100644 --- a/modules/plugin-lib/Makefile.am +++ b/modules/plugin-lib/Makefile.am @@ -5,7 +5,10 @@ module_plugin_lib_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-plugin-lib\" \ -I$(top_srcdir) \ -DEVOLUTION_PREFIX=\""$(prefix)"\" \ - $(EVOLUTION_DATA_SERVER_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) module_plugin_lib_la_SOURCES = \ evolution-module-plugin-lib.c \ @@ -14,7 +17,10 @@ module_plugin_lib_la_SOURCES = \ module_plugin_lib_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ - $(EVOLUTION_DATA_SERVER_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) module_plugin_lib_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) diff --git a/modules/plugin-lib/e-plugin-lib.h b/modules/plugin-lib/e-plugin-lib.h index 91f440bf49..db1056ac93 100644 --- a/modules/plugin-lib/e-plugin-lib.h +++ b/modules/plugin-lib/e-plugin-lib.h @@ -23,7 +23,7 @@ #define E_PLUGIN_LIB_H #include <gmodule.h> -#include <e-util/e-plugin.h> +#include <e-util/e-util.h> /* Standard GObject macros */ #define E_TYPE_PLUGIN_LIB \ diff --git a/modules/plugin-manager/Makefile.am b/modules/plugin-manager/Makefile.am index 03eaa3d77a..0c6a38aab5 100644 --- a/modules/plugin-manager/Makefile.am +++ b/modules/plugin-manager/Makefile.am @@ -3,10 +3,11 @@ module_LTLIBRARIES = module-plugin-manager.la module_plugin_manager_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -DG_LOG_DOMAIN=\"evolution-plugin-manager\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ - $(GNOME_PLATFORM_CFLAGS) + $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) module_plugin_manager_la_SOURCES = \ evolution-plugin-manager.c @@ -15,7 +16,9 @@ module_plugin_manager_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) module_plugin_manager_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) diff --git a/modules/plugin-manager/evolution-plugin-manager.c b/modules/plugin-manager/evolution-plugin-manager.c index 39bc9b9ea3..759b3fdd86 100644 --- a/modules/plugin-manager/evolution-plugin-manager.c +++ b/modules/plugin-manager/evolution-plugin-manager.c @@ -25,7 +25,6 @@ #include <glib/gi18n-lib.h> #include <libebackend/libebackend.h> -#include <e-util/e-plugin.h> #include <shell/e-shell-window.h> #include <shell/e-shell-window-actions.h> diff --git a/modules/prefer-plain/Makefile.am b/modules/prefer-plain/Makefile.am index ac471dfcbd..1b0289ec9e 100644 --- a/modules/prefer-plain/Makefile.am +++ b/modules/prefer-plain/Makefile.am @@ -5,11 +5,12 @@ module_LTLIBRARIES = module-prefer-plain.la module_prefer_plain_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ -DG_LOG_DOMAIN=\"evolution-module-prefer-plain\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ - $(GNOME_PLATFORM_CFLAGS) + $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) module_prefer_plain_la_SOURCES = \ e-mail-parser-prefer-plain.c \ @@ -19,12 +20,14 @@ module_prefer_plain_la_SOURCES = \ evolution-module-prefer-plain.c module_prefer_plain_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/em-format/libemformat.la \ $(top_builddir)/shell/libeshell.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) module_prefer_plain_la_LDFLAGS = \ -avoid-version -module $(NO_UNDEFINED) diff --git a/modules/prefer-plain/plugin/Makefile.am b/modules/prefer-plain/plugin/Makefile.am index d1064cb352..255b914646 100644 --- a/modules/prefer-plain/plugin/Makefile.am +++ b/modules/prefer-plain/plugin/Makefile.am @@ -6,10 +6,11 @@ plugin_LTLIBRARIES = liborg-gnome-prefer-plain.la liborg_gnome_prefer_plain_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ - $(GNOME_PLATFORM_CFLAGS) + $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) liborg_gnome_prefer_plain_la_SOURCES = \ config-ui.c @@ -18,7 +19,9 @@ liborg_gnome_prefer_plain_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_prefer_plain_la_LIBADD = \ $(EVOLUTION_DATA_SERVER_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) BUILT_SOURCES = $(plugin_DATA) diff --git a/modules/prefer-plain/plugin/config-ui.c b/modules/prefer-plain/plugin/config-ui.c index 411ef24dbd..5ed58914d3 100644 --- a/modules/prefer-plain/plugin/config-ui.c +++ b/modules/prefer-plain/plugin/config-ui.c @@ -23,8 +23,6 @@ #include <mail/em-config.h> -#include <libedataserverui/libedataserverui.h> - GtkWidget *prefer_plain_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data); enum { diff --git a/modules/spamassassin/Makefile.am b/modules/spamassassin/Makefile.am index 8475660319..c5ce4c23ce 100644 --- a/modules/spamassassin/Makefile.am +++ b/modules/spamassassin/Makefile.am @@ -5,7 +5,9 @@ module_spamassassin_la_CPPFLAGS = \ -I$(top_srcdir) \ -DG_LOG_DOMAIN=\"evolution-spamassassin\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ - $(GNOME_PLATFORM_CFLAGS) + $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) module_spamassassin_la_SOURCES = \ evolution-spamassassin.c @@ -15,9 +17,10 @@ module_spamassassin_la_LIBADD = \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ - $(top_builddir)/libemail-utils/libemail-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) module_spamassassin_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) diff --git a/modules/spamassassin/evolution-spamassassin.c b/modules/spamassassin/evolution-spamassassin.c index 2202f71003..fa08c56e3b 100644 --- a/modules/spamassassin/evolution-spamassassin.c +++ b/modules/spamassassin/evolution-spamassassin.c @@ -26,7 +26,6 @@ #include <camel/camel.h> #include <shell/e-shell.h> -#include <e-util/e-mktemp.h> #include <libemail-engine/e-mail-junk-filter.h> /* Standard GObject macros */ diff --git a/modules/startup-wizard/Makefile.am b/modules/startup-wizard/Makefile.am index 0642691c49..747b90a7fd 100644 --- a/modules/startup-wizard/Makefile.am +++ b/modules/startup-wizard/Makefile.am @@ -5,10 +5,11 @@ module_LTLIBRARIES = module-startup-wizard.la module_startup_wizard_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -DG_LOG_DOMAIN=\"evolution-startup-wizard\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) \ $(NULL) module_startup_wizard_la_SOURCES = \ @@ -24,15 +25,14 @@ module_startup_wizard_la_SOURCES = \ module_startup_wizard_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ - $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ - $(top_builddir)/libemail-utils/libemail-utils.la \ $(libevolution_mail_settings_la) \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) \ $(NULL) module_startup_wizard_la_LDFLAGS = \ diff --git a/modules/startup-wizard/e-mail-config-import-page.c b/modules/startup-wizard/e-mail-config-import-page.c index 8d2ad1f2f1..4028fee1fa 100644 --- a/modules/startup-wizard/e-mail-config-import-page.c +++ b/modules/startup-wizard/e-mail-config-import-page.c @@ -21,8 +21,6 @@ #include <config.h> #include <glib/gi18n-lib.h> -#include <e-util/e-import.h> - #define E_MAIL_CONFIG_IMPORT_PAGE_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_MAIL_CONFIG_IMPORT_PAGE, EMailConfigImportPagePrivate)) diff --git a/modules/startup-wizard/e-mail-config-import-page.h b/modules/startup-wizard/e-mail-config-import-page.h index 9f378079c6..79dce20e57 100644 --- a/modules/startup-wizard/e-mail-config-import-page.h +++ b/modules/startup-wizard/e-mail-config-import-page.h @@ -21,7 +21,7 @@ #include <gtk/gtk.h> -#include <e-util/e-activity.h> +#include <e-util/e-util.h> #include <mail/e-mail-config-page.h> #include <mail/e-mail-config-summary-page.h> diff --git a/modules/startup-wizard/e-mail-config-import-progress-page.h b/modules/startup-wizard/e-mail-config-import-progress-page.h index 387e6cc19a..f95a937125 100644 --- a/modules/startup-wizard/e-mail-config-import-progress-page.h +++ b/modules/startup-wizard/e-mail-config-import-progress-page.h @@ -21,8 +21,6 @@ #include <gtk/gtk.h> -#include <e-util/e-activity.h> - #include <mail/e-mail-config-page.h> #include "e-mail-config-import-page.h" diff --git a/modules/startup-wizard/e-startup-assistant.c b/modules/startup-wizard/e-startup-assistant.c index 86d6de17b5..19023244fd 100644 --- a/modules/startup-wizard/e-startup-assistant.c +++ b/modules/startup-wizard/e-startup-assistant.c @@ -21,6 +21,8 @@ #include <config.h> #include <glib/gi18n-lib.h> +#include <e-util/e-util.h> + #include <mail/e-mail-config-welcome-page.h> #include "e-mail-config-import-page.h" diff --git a/modules/startup-wizard/evolution-startup-wizard.c b/modules/startup-wizard/evolution-startup-wizard.c index 1ddeaa5168..03c70b7e66 100644 --- a/modules/startup-wizard/evolution-startup-wizard.c +++ b/modules/startup-wizard/evolution-startup-wizard.c @@ -25,9 +25,6 @@ #include <shell/e-shell.h> -#include <libevolution-utils/e-alert-dialog.h> -#include <e-util/e-import.h> - #include <mail/e-mail-backend.h> #include <mail/e-mail-config-assistant.h> #include <mail/e-mail-config-welcome-page.h> diff --git a/modules/text-highlight/Makefile.am b/modules/text-highlight/Makefile.am index fb0094aa0e..8086663b5c 100644 --- a/modules/text-highlight/Makefile.am +++ b/modules/text-highlight/Makefile.am @@ -3,11 +3,12 @@ module_LTLIBRARIES = module-text-highlight.la module_text_highlight_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ -DG_LOG_DOMAIN=\"evolution-module-text-highlight\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ - $(GNOME_PLATFORM_CFLAGS) + $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) module_text_highlight_la_SOURCES = \ e-mail-display-popup-text-highlight.c \ @@ -25,9 +26,10 @@ module_text_highlight_la_LIBADD = \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/em-format/libemformat.la \ $(top_builddir)/shell/libeshell.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) module_text_highlight_la_LDFLAGS = \ -avoid-version -module $(NO_UNDEFINED) diff --git a/modules/tnef-attachment/Makefile.am b/modules/tnef-attachment/Makefile.am index ff5b412275..b8ff625455 100644 --- a/modules/tnef-attachment/Makefile.am +++ b/modules/tnef-attachment/Makefile.am @@ -9,11 +9,12 @@ module_LTLIBRARIES = module-tnef-attachment.la module_tnef_attachment_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ -DG_LOG_DOMAIN=\"evolution-module-tnef-attachment\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) \ $(TNEF_CFLAGS) module_tnef_attachment_la_SOURCES = \ @@ -26,6 +27,8 @@ module_tnef_attachment_la_LIBADD = \ $(top_builddir)/em-format/libemformat.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) \ -lytnef module_tnef_attachment_la_LDFLAGS = \ diff --git a/modules/tnef-attachment/e-mail-parser-tnef-attachment.c b/modules/tnef-attachment/e-mail-parser-tnef-attachment.c index 6ff54b062c..dc93b91955 100644 --- a/modules/tnef-attachment/e-mail-parser-tnef-attachment.c +++ b/modules/tnef-attachment/e-mail-parser-tnef-attachment.c @@ -17,19 +17,14 @@ #include <config.h> #endif +#include "e-mail-parser-tnef-attachment.h" + #include <string.h> #include <gtk/gtk.h> #include <glib/gi18n.h> #include <glib/gprintf.h> #include <stdio.h> -#include "e-mail-parser-tnef-attachment.h" - -#include <em-format/e-mail-extension-registry.h> -#include <em-format/e-mail-parser-extension.h> -#include <em-format/e-mail-part.h> -#include <em-format/e-mail-part-utils.h> - #include <sys/types.h> #include <dirent.h> #include <sys/stat.h> @@ -42,11 +37,15 @@ #include <libytnef/ytnef.h> #endif -#include <mail/em-utils.h> -#include <e-util/e-mktemp.h> - #include <libebackend/libebackend.h> +#include <em-format/e-mail-extension-registry.h> +#include <em-format/e-mail-parser-extension.h> +#include <em-format/e-mail-part.h> +#include <em-format/e-mail-part-utils.h> + +#include <mail/em-utils.h> + #define d(x) typedef struct _EMailParserTnefAttachment { diff --git a/modules/vcard-inline/Makefile.am b/modules/vcard-inline/Makefile.am index 18423f2069..452c977f9a 100644 --- a/modules/vcard-inline/Makefile.am +++ b/modules/vcard-inline/Makefile.am @@ -3,11 +3,12 @@ module_LTLIBRARIES = module-vcard-inline.la module_vcard_inline_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ -DG_LOG_DOMAIN=\"evolution-module-vcard-inline\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ - $(GNOME_PLATFORM_CFLAGS) + $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) module_vcard_inline_la_SOURCES = \ e-mail-formatter-vcard-inline.c \ @@ -25,7 +26,9 @@ module_vcard_inline_la_LIBADD = \ $(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \ $(top_builddir)/addressbook/printing/libecontactprint.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) module_vcard_inline_la_LDFLAGS = \ -avoid-version -module $(NO_UNDEFINED) diff --git a/modules/vcard-inline/e-mail-parser-vcard-inline.c b/modules/vcard-inline/e-mail-parser-vcard-inline.c index bd4050287a..44032d4376 100644 --- a/modules/vcard-inline/e-mail-parser-vcard-inline.c +++ b/modules/vcard-inline/e-mail-parser-vcard-inline.c @@ -38,7 +38,6 @@ #include <libebook/libebook.h> #include <libedataserver/libedataserver.h> -#include <libedataserverui/libedataserverui.h> #include <shell/e-shell.h> #include <addressbook/gui/merging/eab-contact-merging.h> diff --git a/modules/web-inspector/Makefile.am b/modules/web-inspector/Makefile.am index dfd999c213..90da25e594 100644 --- a/modules/web-inspector/Makefile.am +++ b/modules/web-inspector/Makefile.am @@ -3,19 +3,21 @@ module_LTLIBRARIES = module-web-inspector.la module_web_inspector_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -DG_LOG_DOMAIN=\"evolution-web-inspector\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ - $(GNOME_PLATFORM_CFLAGS) + $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) module_web_inspector_la_SOURCES = \ evolution-web-inspector.c module_web_inspector_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) module_web_inspector_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) diff --git a/modules/web-inspector/evolution-web-inspector.c b/modules/web-inspector/evolution-web-inspector.c index 5a7585fbbb..8028ec7465 100644 --- a/modules/web-inspector/evolution-web-inspector.c +++ b/modules/web-inspector/evolution-web-inspector.c @@ -19,9 +19,10 @@ #include <config.h> #include <glib/gi18n-lib.h> -#include <misc/e-web-view.h> #include <libebackend/libebackend.h> +#include <e-util/e-util.h> + /* Standard GObject macros */ #define E_TYPE_WEB_INSPECTOR \ (e_web_inspector_get_type ()) |