Commit a1f29eb3 authored by Milan Crha's avatar Milan Crha
Browse files

Drop the last references to GtkHTML

There still left some references to GtkHTML in the "active code",
which should be dropped. There still can be found couple "GtkHTML"
strings in the code, but mostly in disabled code or comments only.
These are to be fixed separately.
parent 09310a05
......@@ -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.
......
......@@ -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. */
......
......@@ -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}
......@@ -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;
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment