diff options
Diffstat (limited to 'modules/itip-formatter')
| -rw-r--r-- | modules/itip-formatter/Makefile.am | 12 | ||||
| -rw-r--r-- | modules/itip-formatter/e-conflict-search-selector.h | 2 | ||||
| -rw-r--r-- | modules/itip-formatter/e-mail-parser-itip.c | 5 | ||||
| -rw-r--r-- | modules/itip-formatter/e-mail-part-itip.h | 1 | ||||
| -rw-r--r-- | modules/itip-formatter/itip-view.c | 13 | ||||
| -rw-r--r-- | modules/itip-formatter/plugin/Makefile.am | 10 |
6 files changed, 18 insertions, 25 deletions
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) |