diff options
Diffstat (limited to 'addressbook')
39 files changed, 84 insertions, 151 deletions
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am index d67a21bba2..ddd4592bf9 100644 --- a/addressbook/gui/contact-editor/Makefile.am +++ b/addressbook/gui/contact-editor/Makefile.am @@ -3,16 +3,16 @@ privsolib_LTLIBRARIES = libecontacteditor.la libecontacteditor_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -I$(top_srcdir)/addressbook/ \ -I$(top_srcdir)/addressbook/gui/merging \ - -I$(top_srcdir)/widgets/table \ -I$(top_builddir)/shell \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \ -DG_LOG_DOMAIN=\"contact-editor\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ - $(GNOME_PLATFORM_CFLAGS) + $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) libecontacteditor_la_SOURCES = \ eab-editor.c \ @@ -28,15 +28,15 @@ libecontacteditor_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) libecontacteditor_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/addressbook/util/libeabutil.la \ $(top_builddir)/addressbook/gui/widgets/libeabwidgets.la \ $(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \ $(top_builddir)/addressbook/printing/libecontactprint.la \ - $(top_builddir)/widgets/menus/libmenus.la \ $(EVOLUTION_ADDRESSBOOK_LIBS) \ $(EVOLUTION_DATA_SERVER_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) ui_DATA = \ contact-editor.ui \ diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 8e2e455dc1..ef0700baed 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -30,23 +30,16 @@ #include <stdlib.h> #include <string.h> #include <time.h> + #include <gtk/gtk.h> #include <glib/gi18n.h> #include <gdk/gdkkeysyms.h> #include <gdk-pixbuf/gdk-pixbuf.h> -#include <libedataserverui/libedataserverui.h> +#include "shell/e-shell.h" #include "addressbook/printing/e-contact-print.h" #include "addressbook/gui/widgets/eab-gui-util.h" -#include "e-util/e-util.h" -#include "libevolution-utils/e-alert-dialog.h" -#include "misc/e-dateedit.h" -#include "misc/e-image-chooser.h" -#include "misc/e-url-entry.h" -#include "e-util/e-icon-factory.h" -#include "e-util/e-util-private.h" -#include "shell/e-shell.h" #include "eab-contact-merging.h" diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c index e9076a9df8..6dcb7dc628 100644 --- a/addressbook/gui/contact-editor/e-contact-quick-add.c +++ b/addressbook/gui/contact-editor/e-contact-quick-add.c @@ -29,13 +29,10 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> -#include <libedataserverui/libedataserverui.h> - #include <addressbook/util/eab-book-util.h> #include "e-contact-editor.h" #include "e-contact-quick-add.h" #include "eab-contact-merging.h" -#include "libevolution-utils/e-alert-dialog.h" typedef struct _QuickAdd QuickAdd; struct _QuickAdd { diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am index 01a4c7c375..0479683406 100644 --- a/addressbook/gui/contact-list-editor/Makefile.am +++ b/addressbook/gui/contact-list-editor/Makefile.am @@ -3,7 +3,6 @@ privsolib_LTLIBRARIES = libecontactlisteditor.la libecontactlisteditor_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -I$(top_srcdir)/addressbook/ \ -I$(top_srcdir)/addressbook/gui/merging \ -I$(top_srcdir)/addressbook/gui/contact-editor \ @@ -11,7 +10,9 @@ libecontactlisteditor_la_CPPFLAGS = \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DG_LOG_DOMAIN=\"contact-list-editor\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ - $(GNOME_PLATFORM_CFLAGS) + $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) libecontactlisteditor_la_SOURCES = \ e-contact-list-editor.c \ @@ -24,13 +25,12 @@ libecontactlisteditor_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) libecontactlisteditor_la_LIBADD = \ $(top_builddir)/addressbook/util/libeabutil.la \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ - $(top_builddir)/widgets/table/libetable.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.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) + $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) ui_DATA = contact-list-editor.ui diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c index a6205757d8..8f0c8783fb 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c +++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c @@ -25,10 +25,6 @@ #endif #include "e-contact-list-editor.h" -#include <e-util/e-util-private.h> -#include <libevolution-utils/e-alert-dialog.h> -#include <e-util/e-selection.h> -#include "shell/e-shell.h" #include <string.h> @@ -38,7 +34,8 @@ #include <camel/camel.h> -#include "e-util/e-util.h" +#include "shell/e-shell.h" + #include "addressbook/gui/widgets/eab-gui-util.h" #include "addressbook/util/eab-book-util.h" diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.h b/addressbook/gui/contact-list-editor/e-contact-list-editor.h index 07cc4db6bf..bafd7845b1 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-editor.h +++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.h @@ -23,8 +23,6 @@ #ifndef __E_CONTACT_LIST_EDITOR_H__ #define __E_CONTACT_LIST_EDITOR_H__ -#include <libedataserverui/libedataserverui.h> - #include "addressbook/gui/contact-editor/eab-editor.h" #define E_TYPE_CONTACT_LIST_EDITOR \ diff --git a/addressbook/gui/contact-list-editor/e-contact-list-model.c b/addressbook/gui/contact-list-editor/e-contact-list-model.c index 337fd351e4..d2aae534fa 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-model.c +++ b/addressbook/gui/contact-list-editor/e-contact-list-model.c @@ -26,7 +26,6 @@ #include <string.h> #include "e-contact-list-model.h" -#include "libevolution-utils/e-alert-dialog.h" #include "shell/e-shell.h" #define E_CONTACT_LIST_MODEL_GET_PRIVATE(obj) \ diff --git a/addressbook/gui/merging/Makefile.am b/addressbook/gui/merging/Makefile.am index b1c2b45cf4..a6a1522c7a 100644 --- a/addressbook/gui/merging/Makefile.am +++ b/addressbook/gui/merging/Makefile.am @@ -5,10 +5,10 @@ libeabbookmerging_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"eab-contact-merging\" \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -I$(top_srcdir)/addressbook \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) libeabbookmerging_la_SOURCES = \ diff --git a/addressbook/gui/merging/eab-contact-compare.c b/addressbook/gui/merging/eab-contact-compare.c index 7c30b28da8..8b24ea3d57 100644 --- a/addressbook/gui/merging/eab-contact-compare.c +++ b/addressbook/gui/merging/eab-contact-compare.c @@ -28,7 +28,7 @@ #include <ctype.h> #include <string.h> -#include <libedataserverui/libedataserverui.h> +#include "e-util/e-util.h" #include "addressbook/util/eab-book-util.h" #include "eab-contact-compare.h" diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am index 19c9c4f72b..e7ca15e386 100644 --- a/addressbook/gui/widgets/Makefile.am +++ b/addressbook/gui/widgets/Makefile.am @@ -12,12 +12,9 @@ libeabwidgets_la_CPPFLAGS = \ -DEVOLUTION_IMAGESDIR=\"${imagesdir}\" \ -DEVOLUTION_PRIVDATADIR=\"${privdatadir}\" \ -I$(top_srcdir) \ - -I$(top_srcdir)/filter \ - -I$(top_srcdir)/widgets \ -I$(top_srcdir)/addressbook \ -I$(top_srcdir)/addressbook/gui/merging \ -I$(top_srcdir)/addressbook/util \ - -I$(top_srcdir)/widgets/misc \ -I$(top_builddir)/shell \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ @@ -69,11 +66,7 @@ libeabwidgets_la_SOURCES = \ ea-addressbook.h libeabwidgets_la_LIBADD = \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/shell/libeshell.la \ - $(top_builddir)/widgets/table/libetable.la \ - $(top_builddir)/widgets/menus/libmenus.la \ - $(top_builddir)/a11y/libevolution-a11y.la \ $(top_builddir)/e-util/libeutil.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h b/addressbook/gui/widgets/e-addressbook-reflow-adapter.h index d65f3f39fd..fee217c2f1 100644 --- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h +++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.h @@ -22,7 +22,8 @@ #define _E_ADDRESSBOOK_REFLOW_ADAPTER_H_ #include <libebook/libebook.h> -#include <text/e-reflow-model.h> + +#include <e-util/e-util.h> #include "e-addressbook-model.h" diff --git a/addressbook/gui/widgets/e-addressbook-selector.c b/addressbook/gui/widgets/e-addressbook-selector.c index 513da877bc..2441a0bc89 100644 --- a/addressbook/gui/widgets/e-addressbook-selector.c +++ b/addressbook/gui/widgets/e-addressbook-selector.c @@ -24,7 +24,7 @@ #include "e-addressbook-selector.h" -#include <e-util/e-selection.h> +#include <e-util/e-util.h> #include <eab-book-util.h> #include <eab-contact-merging.h> diff --git a/addressbook/gui/widgets/e-addressbook-selector.h b/addressbook/gui/widgets/e-addressbook-selector.h index adabea7205..663f58656b 100644 --- a/addressbook/gui/widgets/e-addressbook-selector.h +++ b/addressbook/gui/widgets/e-addressbook-selector.h @@ -21,8 +21,6 @@ #ifndef E_ADDRESSBOOK_SELECTOR_H #define E_ADDRESSBOOK_SELECTOR_H -#include <libedataserverui/libedataserverui.h> - #include "e-addressbook-view.h" /* Standard GObject macros */ diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.h b/addressbook/gui/widgets/e-addressbook-table-adapter.h index 51c9436ff2..4b089b2d0a 100644 --- a/addressbook/gui/widgets/e-addressbook-table-adapter.h +++ b/addressbook/gui/widgets/e-addressbook-table-adapter.h @@ -21,7 +21,7 @@ #ifndef _EAB_TABLE_ADAPTER_H_ #define _EAB_TABLE_ADAPTER_H_ -#include <table/e-table-model.h> +#include <e-util/e-util.h> /* Standard GObject macros */ #define E_TYPE_ADDRESSBOOK_TABLE_ADAPTER \ diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index 5206041d29..53402a9e6e 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -25,40 +25,29 @@ #include <config.h> #endif +#include <ctype.h> +#include <string.h> + #include <glib/gi18n.h> -#include <table/e-table.h> -#include <table/e-table-model.h> -#include <table/e-cell-date.h> -#include <misc/e-selectable.h> -#include <widgets/menus/gal-view-factory-etable.h> -#include <filter/e-rule-editor.h> -#include <widgets/menus/gal-view-etable.h> -#include <shell/e-shell-sidebar.h> +#include <gdk/gdkkeysyms.h> -#include "addressbook/printing/e-contact-print.h" -#include "ea-addressbook.h" +#include "e-addressbook-view.h" -#include "e-util/e-print.h" -#include "e-util/e-selection.h" #include "e-util/e-util.h" +#include "shell/e-shell-sidebar.h" + +#include "addressbook/printing/e-contact-print.h" +#include "ea-addressbook.h" #include "gal-view-minicard.h" #include "gal-view-factory-minicard.h" -#include "e-addressbook-view.h" #include "e-addressbook-model.h" #include "eab-gui-util.h" #include "util/eab-book-util.h" #include "e-addressbook-table-adapter.h" #include "eab-contact-merging.h" -#include "libevolution-utils/e-alert-dialog.h" -#include "e-util/e-util-private.h" - -#include <gdk/gdkkeysyms.h> -#include <ctype.h> -#include <string.h> - #define E_ADDRESSBOOK_VIEW_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_ADDRESSBOOK_VIEW, EAddressbookViewPrivate)) diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h index 3c8c5e2218..94668d6ace 100644 --- a/addressbook/gui/widgets/e-addressbook-view.h +++ b/addressbook/gui/widgets/e-addressbook-view.h @@ -25,10 +25,7 @@ #include <libebook/libebook.h> -#include <menus/gal-view-instance.h> -#include <misc/e-selection-model.h> #include <shell/e-shell-view.h> -#include <filter/e-filter-rule.h> #include "e-addressbook-model.h" #include "eab-contact-display.h" diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c index 618e4ea160..0e75917b80 100644 --- a/addressbook/gui/widgets/e-minicard-label.c +++ b/addressbook/gui/widgets/e-minicard-label.c @@ -27,14 +27,13 @@ #include "e-minicard-label.h" #include <gtk/gtk.h> -#include <libgnomecanvas/libgnomecanvas.h> #include <glib/gi18n.h> -#include <e-util/e-util.h> -#include <text/e-text.h> -#include <misc/e-canvas.h> -#include <misc/e-canvas-utils.h> #include <gdk/gdkkeysyms.h> +#include <libgnomecanvas/libgnomecanvas.h> + +#include "e-util/e-util.h" + static void e_minicard_label_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec); static void e_minicard_label_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec); static gboolean e_minicard_label_event (GnomeCanvasItem *item, GdkEvent *event); diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c index ecb2483652..7ff63a1bd9 100644 --- a/addressbook/gui/widgets/e-minicard-view-widget.c +++ b/addressbook/gui/widgets/e-minicard-view-widget.c @@ -25,11 +25,10 @@ #endif #include <gtk/gtk.h> -#include <misc/e-canvas-background.h> -#include <misc/e-canvas.h> #include <glib/gi18n.h> -#include "e-util/e-util.h" +#include <e-util/e-util.h> + #include "e-minicard-view-widget.h" static void e_minicard_view_widget_set_property diff --git a/addressbook/gui/widgets/e-minicard-view-widget.h b/addressbook/gui/widgets/e-minicard-view-widget.h index f540a43f8e..71fe00a497 100644 --- a/addressbook/gui/widgets/e-minicard-view-widget.h +++ b/addressbook/gui/widgets/e-minicard-view-widget.h @@ -23,9 +23,10 @@ #ifndef __E_MINICARD_VIEW_WIDGET_H__ #define __E_MINICARD_VIEW_WIDGET_H__ -#include <misc/e-canvas.h> #include <libebook/libebook.h> +#include <e-util/e-util.h> + #include "e-minicard-view.h" G_BEGIN_DECLS diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c index 1889399f3d..08b0cdabf4 100644 --- a/addressbook/gui/widgets/e-minicard-view.c +++ b/addressbook/gui/widgets/e-minicard-view.c @@ -26,16 +26,17 @@ #include "e-minicard-view.h" -#include "eab-gui-util.h" -#include "util/eab-book-util.h" -#include "e-util/e-util.h" +#include <string.h> #include <gtk/gtk.h> -#include <gdk/gdkkeysyms.h> -#include <misc/e-canvas.h> #include <glib/gi18n.h> -#include <string.h> +#include <gdk/gdkkeysyms.h> + #include "e-util/e-util.h" + +#include "eab-gui-util.h" +#include "util/eab-book-util.h" + #include "ea-addressbook.h" static void e_minicard_view_drag_data_get (GtkWidget *widget, diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h index 1024a85088..bf116e4513 100644 --- a/addressbook/gui/widgets/e-minicard-view.h +++ b/addressbook/gui/widgets/e-minicard-view.h @@ -26,8 +26,8 @@ #include "e-minicard.h" -#include <text/e-reflow.h> -#include <misc/e-selection-model-simple.h> +#include <e-util/e-util.h> + #include "e-addressbook-reflow-adapter.h" G_BEGIN_DECLS diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index b0dae34b69..6a049aca50 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -24,20 +24,19 @@ #include <config.h> #endif +#include "e-minicard.h" + #include <string.h> -#include <gdk/gdkkeysyms.h> #include <glib/gi18n.h> +#include <gdk/gdkkeysyms.h> + #include <libgnomecanvas/libgnomecanvas.h> -#include <text/e-text.h> -#include <e-util/e-util.h> -#include <misc/e-canvas-utils.h> -#include <misc/e-canvas.h> + +#include "e-util/e-util.h" + #include "eab-gui-util.h" -#include "e-minicard.h" #include "e-minicard-label.h" #include "e-minicard-view.h" -#include <e-util/e-html-utils.h> -#include <e-util/e-icon-factory.h> #include "ea-addressbook.h" static void e_minicard_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec); diff --git a/addressbook/gui/widgets/ea-addressbook.c b/addressbook/gui/widgets/ea-addressbook.c index ca218f4245..51af22d0d4 100644 --- a/addressbook/gui/widgets/ea-addressbook.c +++ b/addressbook/gui/widgets/ea-addressbook.c @@ -24,8 +24,8 @@ #include <config.h> #endif -#include <text/e-text.h> -#include "a11y/ea-factory.h" +#include "e-util/e-util.h" + #include "ea-addressbook.h" #include "ea-minicard.h" #include "ea-minicard-view.h" diff --git a/addressbook/gui/widgets/eab-config.h b/addressbook/gui/widgets/eab-config.h index 3907889415..83c08b4172 100644 --- a/addressbook/gui/widgets/eab-config.h +++ b/addressbook/gui/widgets/eab-config.h @@ -26,7 +26,7 @@ #include <libedataserver/libedataserver.h> -#include "e-util/e-config.h" +#include <e-util/e-util.h> #define EAB_TYPE_CONFIG (eab_config_get_type ()) #define EAB_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EAB_TYPE_CONFIG, EABConfig)) diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c index e00e089d38..549278b994 100644 --- a/addressbook/gui/widgets/eab-contact-display.c +++ b/addressbook/gui/widgets/eab-contact-display.c @@ -25,25 +25,17 @@ #endif #include "eab-contact-display.h" -#include "eab-contact-formatter.h" -#include "eab-gui-util.h" -#include "e-util/e-util.h" -#include "e-util/e-util-private.h" -#include "e-util/e-html-utils.h" -#include "e-util/e-icon-factory.h" -#include "e-util/e-plugin-ui.h" -#include "e-util/e-file-request.h" -#include "e-util/e-stock-request.h" +#include <string.h> +#include <glib/gi18n.h> #include <webkit/webkit.h> -#ifdef WITH_CONTACT_MAPS -#include "widgets/misc/e-contact-map.h" -#endif +#include "e-util/e-util.h" -#include <string.h> -#include <glib/gi18n.h> +#include "eab-contact-formatter.h" + +#include "eab-gui-util.h" #define EAB_CONTACT_DISPLAY_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ diff --git a/addressbook/gui/widgets/eab-contact-display.h b/addressbook/gui/widgets/eab-contact-display.h index 79243dedae..484e312b6b 100644 --- a/addressbook/gui/widgets/eab-contact-display.h +++ b/addressbook/gui/widgets/eab-contact-display.h @@ -25,7 +25,7 @@ #include <libebook/libebook.h> -#include <misc/e-web-view.h> +#include <e-util/e-util.h> /* Standard GObject macros */ #define EAB_TYPE_CONTACT_DISPLAY \ diff --git a/addressbook/gui/widgets/eab-contact-formatter.c b/addressbook/gui/widgets/eab-contact-formatter.c index a3893188e3..3684e4b81c 100644 --- a/addressbook/gui/widgets/eab-contact-formatter.c +++ b/addressbook/gui/widgets/eab-contact-formatter.c @@ -20,20 +20,13 @@ #include "eab-contact-formatter.h" -#include "eab-gui-util.h" -#include "e-util/e-util.h" -#include "e-util/e-util-private.h" -#include "e-util/e-html-utils.h" -#include "e-util/e-icon-factory.h" -#include "e-util/e-plugin-ui.h" - -#ifdef WITH_CONTACT_MAPS -#include "widgets/misc/e-contact-map.h" -#endif - #include <string.h> #include <glib/gi18n.h> +#include "e-util/e-util.h" + +#include "eab-gui-util.h" + G_DEFINE_TYPE ( EABContactFormatter, eab_contact_formatter, diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index 736f64d422..1fc8644833 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -35,16 +35,10 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> -#include <libedataserverui/libedataserverui.h> +#include "shell/e-shell.h" -#include <e-util/e-util.h> #include "eab-gui-util.h" #include "util/eab-book-util.h" -#include "libevolution-utils/e-alert-dialog.h" -#include "e-util/e-html-utils.h" -#include "shell/e-shell.h" -#include "misc/e-image-chooser.h" -#include <e-util/e-icon-factory.h> #include "eab-contact-merging.h" /* we link to camel for decoding quoted printable email addresses */ diff --git a/addressbook/gui/widgets/eab-gui-util.h b/addressbook/gui/widgets/eab-gui-util.h index 7cdd93e84d..6d3c7bf5cb 100644 --- a/addressbook/gui/widgets/eab-gui-util.h +++ b/addressbook/gui/widgets/eab-gui-util.h @@ -27,7 +27,7 @@ #include <gtk/gtk.h> #include <libebook/libebook.h> -#include "libevolution-utils/e-alert-sink.h" +#include <e-util/e-util.h> G_BEGIN_DECLS diff --git a/addressbook/gui/widgets/gal-view-factory-minicard.h b/addressbook/gui/widgets/gal-view-factory-minicard.h index e96c4e455c..a01f5e9075 100644 --- a/addressbook/gui/widgets/gal-view-factory-minicard.h +++ b/addressbook/gui/widgets/gal-view-factory-minicard.h @@ -26,7 +26,7 @@ #ifndef GAL_VIEW_FACTORY_MINICARD_H #define GAL_VIEW_FACTORY_MINICARD_H -#include <widgets/menus/gal-view-factory.h> +#include <e-util/e-util.h> /* Standard GObject macros */ #define GAL_TYPE_VIEW_FACTORY_MINICARD \ diff --git a/addressbook/gui/widgets/gal-view-minicard.c b/addressbook/gui/widgets/gal-view-minicard.c index a623c57c90..dffe8069be 100644 --- a/addressbook/gui/widgets/gal-view-minicard.c +++ b/addressbook/gui/widgets/gal-view-minicard.c @@ -28,7 +28,6 @@ #endif #include <libxml/parser.h> -#include <libevolution-utils/e-xml-utils.h> #include "gal-view-minicard.h" diff --git a/addressbook/gui/widgets/gal-view-minicard.h b/addressbook/gui/widgets/gal-view-minicard.h index b360301268..04e67113de 100644 --- a/addressbook/gui/widgets/gal-view-minicard.h +++ b/addressbook/gui/widgets/gal-view-minicard.h @@ -25,7 +25,7 @@ #ifndef GAL_VIEW_MINICARD_H #define GAL_VIEW_MINICARD_H -#include <widgets/menus/gal-view.h> +#include <e-util/e-util.h> #include <e-minicard-view-widget.h> #include "e-addressbook-view.h" diff --git a/addressbook/importers/Makefile.am b/addressbook/importers/Makefile.am index 515370d38c..cd509f9eb6 100644 --- a/addressbook/importers/Makefile.am +++ b/addressbook/importers/Makefile.am @@ -7,10 +7,11 @@ libevolution_addressbook_importers_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"Evolution-Importer\" \ -I$(top_srcdir) \ -I$(top_srcdir)/addressbook \ - -I$(top_srcdir)/widgets \ -I$(top_builddir)/addressbook \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ - $(GNOME_PLATFORM_CFLAGS) + $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) libevolution_addressbook_importers_la_SOURCES = \ evolution-ldif-importer.c \ @@ -24,9 +25,10 @@ libevolution_addressbook_importers_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/addressbook/util/libeabutil.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) \ $(IMPORTERS_LIBS) -include $(top_srcdir)/git.mk diff --git a/addressbook/importers/evolution-csv-importer.c b/addressbook/importers/evolution-csv-importer.c index 7594ab1cf3..b32f8e1b7b 100644 --- a/addressbook/importers/evolution-csv-importer.c +++ b/addressbook/importers/evolution-csv-importer.c @@ -35,10 +35,8 @@ #include <glib/gstdio.h> #include <libebook/libebook.h> -#include <libedataserverui/libedataserverui.h> #include <shell/e-shell.h> -#include <e-util/e-import.h> #include "evolution-addressbook-importers.h" diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c index c95b2f4357..db2bfbf27d 100644 --- a/addressbook/importers/evolution-ldif-importer.c +++ b/addressbook/importers/evolution-ldif-importer.c @@ -42,10 +42,8 @@ #include <glib/gstdio.h> #include <libebook/libebook.h> -#include <libedataserverui/libedataserverui.h> #include <shell/e-shell.h> -#include <e-util/e-import.h> #include "evolution-addressbook-importers.h" diff --git a/addressbook/importers/evolution-vcard-importer.c b/addressbook/importers/evolution-vcard-importer.c index d430bd24eb..5129754501 100644 --- a/addressbook/importers/evolution-vcard-importer.c +++ b/addressbook/importers/evolution-vcard-importer.c @@ -36,14 +36,10 @@ #include <glib/gstdio.h> #include <libebook/libebook.h> -#include <libedataserverui/libedataserverui.h> #include <util/eab-book-util.h> #include <shell/e-shell.h> -#include <e-util/e-import.h> -#include <e-util/e-datetime-format.h> -#include <misc/e-web-view-preview.h> #include "evolution-addressbook-importers.h" diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am index edf3cc9795..fa92d19676 100644 --- a/addressbook/printing/Makefile.am +++ b/addressbook/printing/Makefile.am @@ -12,7 +12,9 @@ libecontactprint_la_CPPFLAGS = \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ - $(GNOME_PLATFORM_CFLAGS) + $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) noinst_LTLIBRARIES = libecontactprint.la @@ -22,10 +24,11 @@ libecontactprint_la_SOURCES = \ e-contact-print.h libecontactprint_la_LIBADD = \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/e-util/libeutil.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) noinst_PROGRAMS = contact-print-test diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c index 290863c817..248fa97515 100644 --- a/addressbook/printing/e-contact-print.c +++ b/addressbook/printing/e-contact-print.c @@ -33,7 +33,6 @@ #include <libxml/xmlmemory.h> #include <glib/gi18n.h> -#include "e-util/e-print.h" #include "e-util/e-util.h" #include "e-util/e-util-private.h" diff --git a/addressbook/util/Makefile.am b/addressbook/util/Makefile.am index c27b18c67c..10f3bb0b97 100644 --- a/addressbook/util/Makefile.am +++ b/addressbook/util/Makefile.am @@ -10,7 +10,6 @@ libeabutil_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir)/shell \ -I$(top_srcdir)/shell \ - -I$(top_srcdir)/widgets \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) @@ -21,7 +20,6 @@ libeabutil_la_SOURCES = \ libeabutil_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) libeabutil_la_LIBADD = \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ |