[evolution/wip-webkit2] Fix the WebKit2 port of Evolution to let it compile

[Tomas Popela <tpopela src gnome org>]

commit 5e3d0d606fd1e747ee511a69e062f063c5af93e2
Author: Tomas Popela <tpopela redhat com>
Date:   Thu Aug 28 16:20:07 2014 +0200

    Fix the WebKit2 port of Evolution to let it compile

 configure.ac                                       |    2 +-
 e-util/e-attachment.c                              |    4 ++--
 e-util/e-dom-utils.c                               |   15 +--------------
 e-util/e-dom-utils.h                               |    5 -----
 mail/e-mail-display.c                              |    6 ++++--
 .../module-itip-formatter-dom-utils.h              |    1 -
 .../module-itip-formatter-web-extension.c          |    2 +-
 .../mail/web-extension/module-mail-web-extension.c |    2 +-
 .../module-prefer-plain-web-extension.c            |    2 +-
 .../module-text-highlight-web-extension.c          |    2 +-
 web-extensions/evolution-web-extension.c           |    3 ++-
 11 files changed, 14 insertions(+), 30 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b50e028..f175d8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,7 +51,7 @@ m4_define([gcr_minimum_version], [3.4])
 m4_define([gnome_desktop_minimum_version], [2.91.3])
 m4_define([gnome_icon_theme_minimum_version], [2.30.2.1])
 m4_define([gsettings_desktop_schemas_minimum_version], [2.91.92])
-m4_define([webkit2gtk_minimum_version], [2.0.1])
+m4_define([webkit2gtk_minimum_version], [2.4.0])
 m4_define([libgdata_minimum_version], [0.10])
 m4_define([libxml_minimum_version], [2.7.3])
 m4_define([shared_mime_info_minimum_version], [0.22])
diff --git a/e-util/e-attachment.c b/e-util/e-attachment.c
index bad4e0b..82e3b67 100644
--- a/e-util/e-attachment.c
+++ b/e-util/e-attachment.c
@@ -1855,7 +1855,7 @@ attachment_load_write_cb (GOutputStream *output_stream,
                load_context->total_num_bytes, attachment);
 
        if (bytes_written < load_context->bytes_read) {
-               g_memmove (
+               memmove (
                        load_context->buffer,
                        load_context->buffer + bytes_written,
                        load_context->bytes_read - bytes_written);
@@ -2762,7 +2762,7 @@ attachment_save_write_cb (GOutputStream *output_stream,
        input_stream = save_context->input_stream;
 
        if (bytes_written < save_context->bytes_read) {
-               g_memmove (
+               memmove (
                        save_context->buffer,
                        save_context->buffer + bytes_written,
                        save_context->bytes_read - bytes_written);
diff --git a/e-util/e-dom-utils.c b/e-util/e-dom-utils.c
index 552943d..679801b 100644
--- a/e-util/e-dom-utils.c
+++ b/e-util/e-dom-utils.c
@@ -282,15 +282,9 @@ e_dom_utils_create_and_add_css_style_sheet (WebKitDOMDocument *document,
        if (!style_element) {
                /* Create new <style> element */
                style_element = webkit_dom_document_create_element (document, "style", NULL);
-#if WEBKIT_CHECK_VERSION(2,2,0) /* XXX should really be (2,1,something) */
                webkit_dom_element_set_id (
                        style_element,
                        style_sheet_id);
-#else
-               webkit_dom_html_element_set_id (
-                       WEBKIT_DOM_HTML_ELEMENT (style_element),
-                       style_sheet_id);
-#endif
                webkit_dom_html_style_element_set_media (
                        WEBKIT_DOM_HTML_STYLE_ELEMENT (style_element),
                        "screen");
@@ -448,11 +442,7 @@ collapse_contacts_list (WebKitDOMEventTarget *event_target,
        gboolean hidden;
 
        document = user_data;
-#if WEBKIT_CHECK_VERSION(2,2,0) /* XXX should really be (2,1,something) */
        id = webkit_dom_element_get_id (WEBKIT_DOM_ELEMENT (event_target));
-#else
-       id = webkit_dom_html_element_get_id (WEBKIT_DOM_HTML_ELEMENT (event_target));
-#endif
 
        list_id = g_strconcat ("list-", id, NULL);
        list = webkit_dom_document_get_element_by_id (document, list_id);
@@ -1131,11 +1121,8 @@ display_mode_toggle_button_cb (WebKitDOMElement *button,
        GError *error = NULL;
        gchar *element_id;
 
-#if WEBKIT_CHECK_VERSION(2,2,0) /* XXX should really be (2,1,something) */
        element_id = webkit_dom_element_get_id (button);
-#else
-       element_id = webkit_dom_html_element_get_id (WEBKIT_DOM_HTML_ELEMENT (button));
-#endif
+
        g_dbus_connection_emit_signal (
                connection,
                NULL,
diff --git a/e-util/e-dom-utils.h b/e-util/e-dom-utils.h
index 6803951..2da7d94 100644
--- a/e-util/e-dom-utils.h
+++ b/e-util/e-dom-utils.h
@@ -16,15 +16,10 @@
  *
  */
 
-#if (!defined (__E_UTIL_H_INSIDE__) && !defined (LIBEUTIL_COMPILATION))
-#error "Only <e-util/e-util.h> should be included directly."
-#endif
-
 #ifndef E_DOM_UTILS_H
 #define E_DOM_UTILS_H
 
 #include <webkitdom/webkitdom.h>
-#include <webkit2/webkit2.h>
 
 #include <gtk/gtk.h>
 
diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c
index 32113ff..26c73a5 100644
--- a/mail/e-mail-display.c
+++ b/mail/e-mail-display.c
@@ -1104,7 +1104,7 @@ chainup:
        return GTK_WIDGET_CLASS (e_mail_display_parent_class)->
                button_press_event (widget, event);
 }
-
+#if 0
 static gchar *
 mail_display_redirect_uri (EWebView *web_view,
                            const gchar *uri)
@@ -1230,7 +1230,7 @@ mail_display_suggest_filename (EWebView *web_view,
        return E_WEB_VIEW_CLASS (e_mail_display_parent_class)->
                suggest_filename (web_view, uri);
 }
-
+#endif
 static void
 mail_display_get_font_settings (GSettings *settings,
                                 PangoFontDescription **monospace,
@@ -1291,8 +1291,10 @@ e_mail_display_class_init (EMailDisplayClass *class)
        widget_class->button_press_event = mail_display_button_press_event;
 
        web_view_class = E_WEB_VIEW_CLASS (class);
+#if 0
        web_view_class->redirect_uri = mail_display_redirect_uri;
        web_view_class->suggest_filename = mail_display_suggest_filename;
+#endif
        web_view_class->set_fonts = mail_display_set_fonts;
 
        g_object_class_install_property (
diff --git a/modules/itip-formatter/module-itip-formatter-dom-utils.h 
b/modules/itip-formatter/module-itip-formatter-dom-utils.h
index e0ec07e..b34e2d2 100644
--- a/modules/itip-formatter/module-itip-formatter-dom-utils.h
+++ b/modules/itip-formatter/module-itip-formatter-dom-utils.h
@@ -20,7 +20,6 @@
 #define MODULE_ITIP_FORMATTER_DOM_UTILS_H
 
 #include <webkitdom/webkitdom.h>
-#include <webkit2/webkit2.h>
 
 #include <gtk/gtk.h>
 
diff --git a/modules/itip-formatter/web-extension/module-itip-formatter-web-extension.c 
b/modules/itip-formatter/web-extension/module-itip-formatter-web-extension.c
index 13102cf..7fc005d 100644
--- a/modules/itip-formatter/web-extension/module-itip-formatter-web-extension.c
+++ b/modules/itip-formatter/web-extension/module-itip-formatter-web-extension.c
@@ -22,7 +22,7 @@
 #include <gtk/gtk.h>
 #include <webkit2/webkit-web-extension.h>
 
-#include <e-util/e-util.h>
+#include <e-util/e-dom-utils.h>
 
 #include "../module-itip-formatter-dom-utils.h"
 
diff --git a/modules/mail/web-extension/module-mail-web-extension.c 
b/modules/mail/web-extension/module-mail-web-extension.c
index 4c3b570..a3c9a7e 100644
--- a/modules/mail/web-extension/module-mail-web-extension.c
+++ b/modules/mail/web-extension/module-mail-web-extension.c
@@ -22,7 +22,7 @@
 #include <gtk/gtk.h>
 #include <webkit2/webkit-web-extension.h>
 
-#include <e-util/e-util.h>
+#include <e-util/e-dom-utils.h>
 
 /* FIXME Clean it */
 static GDBusConnection *dbus_connection;
diff --git a/modules/prefer-plain/web-extension/module-prefer-plain-web-extension.c 
b/modules/prefer-plain/web-extension/module-prefer-plain-web-extension.c
index daee1a7..8c2d6ee 100644
--- a/modules/prefer-plain/web-extension/module-prefer-plain-web-extension.c
+++ b/modules/prefer-plain/web-extension/module-prefer-plain-web-extension.c
@@ -22,7 +22,7 @@
 #include <gtk/gtk.h>
 #include <webkit2/webkit-web-extension.h>
 
-#include <e-util/e-util.h>
+#include <e-util/e-dom-utils.h>
 
 /* FIXME Clean it */
 static GDBusConnection *dbus_connection;
diff --git a/modules/text-highlight/web-extension/module-text-highlight-web-extension.c 
b/modules/text-highlight/web-extension/module-text-highlight-web-extension.c
index e3215af..acb32db 100644
--- a/modules/text-highlight/web-extension/module-text-highlight-web-extension.c
+++ b/modules/text-highlight/web-extension/module-text-highlight-web-extension.c
@@ -22,7 +22,7 @@
 #include <gtk/gtk.h>
 #include <webkit2/webkit-web-extension.h>
 
-#include <e-util/e-util.h>
+#include <e-util/e-dom-utils.h>
 
 /* FIXME Clean it */
 static GDBusConnection *dbus_connection;
diff --git a/web-extensions/evolution-web-extension.c b/web-extensions/evolution-web-extension.c
index 87606d3..18df6fe 100644
--- a/web-extensions/evolution-web-extension.c
+++ b/web-extensions/evolution-web-extension.c
@@ -26,7 +26,8 @@
 
 #include <string.h>
 
-#include <e-util/e-util.h>
+#include <e-util/e-dom-utils.h>
+#include <libedataserver/libedataserver.h>
 
 /* FIXME Clean it */
 static GDBusConnection *dbus_connection;