diff options
| -rw-r--r-- | doc/reference/evolution-mail-engine/Makefile.am | 2 | ||||
| -rw-r--r-- | e-util/e-web-view.h | 4 | ||||
| -rw-r--r-- | evolution-shell.pc.in | 2 | ||||
| -rw-r--r-- | mail/em-composer-utils.c | 2 | ||||
| -rw-r--r-- | modules/bogofilter/Makefile.am | 4 |
5 files changed, 4 insertions, 10 deletions
diff --git a/doc/reference/evolution-mail-engine/Makefile.am b/doc/reference/evolution-mail-engine/Makefile.am index 1e8cb5c49e..6d44a99324 100644 --- a/doc/reference/evolution-mail-engine/Makefile.am +++ b/doc/reference/evolution-mail-engine/Makefile.am @@ -21,14 +21,12 @@ GTKDOC_CFLAGS= \ -I$(top_builddir) \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ $(NULL) GTKDOC_LIBS= \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) \ $(NULL) # This includes the standard gtk-doc make rules, copied by gtkdocize. diff --git a/e-util/e-web-view.h b/e-util/e-web-view.h index 657b4f7794..1836f70ec8 100644 --- a/e-util/e-web-view.h +++ b/e-util/e-web-view.h @@ -16,9 +16,7 @@ */ /* This is intended to serve as a common base class for all HTML viewing - * needs in Evolution. Currently based on GtkHTML, the idea is to wrap - * the GtkHTML API enough that we no longer have to make direct calls to - * it. This should help smooth the transition to WebKit/GTK+. + * needs in Evolution. * * This class handles basic tasks like mouse hovers over links, clicked * links, and servicing URI requests asynchronously via GIO. */ diff --git a/evolution-shell.pc.in b/evolution-shell.pc.in index eb3de3c0bf..85872e8957 100644 --- a/evolution-shell.pc.in +++ b/evolution-shell.pc.in @@ -18,7 +18,7 @@ execversion=@BASE_VERSION@ Name: evolution-shell Description: libraries needed for Evolution shell components Version: @VERSION@ -Requires: gtk+-3.0 libebackend-1.2 webkitgtk-3.0 libgtkhtml-4.0 gtkhtml-editor-4.0 +Requires: gtk+-3.0 libebackend-1.2 webkitgtk-3.0 Requires.private: gnome-desktop-3.0 Libs: -L${privlibdir} -levolution-shell -levolution-util -Wl,-R${privlibdir} Cflags: -I${privincludedir} diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index afa7e28c18..df3e1bf92b 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -1048,7 +1048,7 @@ em_utils_composer_print_cb (EMsgComposer *composer, /* as long as EMsgComposer uses GtkHTML, use its routine for printing; * this conditional compile is here rather to not forget to fix this * once the WebKit-based composer will land */ -#if defined(GTK_TYPE_HTML) +#if 0 /* defined(GTK_TYPE_HTML) */ EWebViewGtkHTML *gtkhtml_web_view; GtkPrintOperation *operation; GError *error = NULL; diff --git a/modules/bogofilter/Makefile.am b/modules/bogofilter/Makefile.am index b967a94cdd..37ae00c5de 100644 --- a/modules/bogofilter/Makefile.am +++ b/modules/bogofilter/Makefile.am @@ -7,7 +7,6 @@ module_bogofilter_la_CPPFLAGS = \ -DWELCOME_MESSAGE=\""$(privdatadir)/default/C/mail/local/Inbox"\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ $(CODE_COVERAGE_CFLAGS) module_bogofilter_la_SOURCES = \ @@ -18,8 +17,7 @@ module_bogofilter_la_LIBADD = \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ - $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) + $(GNOME_PLATFORM_LIBS) module_bogofilter_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) |