[geary/wip/720315-webkitgtk-2.4] Compile against WebKitGTK 2.3.2

[Jim Nelson <jnelson src gnome org>]

commit 8bb2863340c3d5f2eb4572cc1fb4a7dc768f72f7
Author: Jim Nelson <jim yorba org>
Date:   Tue Dec 17 16:42:26 2013 -0800

    Compile against WebKitGTK 2.3.2

 .../metadata/webkitgtk-2.4/WebKit-3.0-custom.vala  |   10 ++++++++++
 .../metadata/webkitgtk-2.4/WebKit-3.0.metadata     |    8 ++++----
 src/CMakeLists.txt                                 |    6 +++++-
 3 files changed, 19 insertions(+), 5 deletions(-)
---
diff --git a/bindings/metadata/webkitgtk-2.4/WebKit-3.0-custom.vala 
b/bindings/metadata/webkitgtk-2.4/WebKit-3.0-custom.vala
new file mode 100644
index 0000000..e1eb544
--- /dev/null
+++ b/bindings/metadata/webkitgtk-2.4/WebKit-3.0-custom.vala
@@ -0,0 +1,10 @@
+namespace WebKit {
+    namespace DOM {
+        [CCode (cheader_filename="webkit/webkit.h", type_id="webkit_dom_event_target_get_type()")]
+        public interface EventTarget {
+            public abstract bool add_event_listener(string event_name, GLib.Callback handler, bool 
use_capture, GLib.Object? object);
+            public abstract bool remove_event_listener(string event_name, GLib.Callback handler, bool 
use_capture);
+        }
+    }
+}
+
diff --git a/bindings/metadata/webkitgtk-2.4/WebKit-3.0.metadata 
b/bindings/metadata/webkitgtk-2.4/WebKit-3.0.metadata
index 49723e4..4ea60ae 100644
--- a/bindings/metadata/webkitgtk-2.4/WebKit-3.0.metadata
+++ b/bindings/metadata/webkitgtk-2.4/WebKit-3.0.metadata
@@ -1,9 +1,9 @@
 DOM* parent="WebKit.DOM" name="DOM(.+)"
 
-DOMEventTarget.add_event_listener skip=false
-DOMEventTarget.add_event_listener.handler closure=-1
-DOMEventTarget.add_event_listener.user_data closure=-1
-DOMEventTarget.remove_event_listener skip=false
+DOMEventTarget.add_event_listener skip=true
+DOMEventTarget.add_event_listener_with_closure skip=true
+DOMEventTarget.remove_event_listener skip=true
+DOMEventTarget.remove_event_listener_with_closure skip=true
 
 WebView.entering_fullscreen#signal name="entering_fullscreen_signal"
 WebView.leaving_fullscreen#signal name="leaving_fullscreen_signal"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4e0c113..0e2e95b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -448,6 +448,10 @@ if (WEBKITGTK24X_FOUND)
     SET(WEBKITGTK_METADATA_DIR
         webkitgtk-2.4
     )
+       
+       SET(WEBKITGTK_CUSTOM_VALA
+               webkitgtk-2.4/WebKit-3.0-custom.vala
+       )
 elseif (WEBKITGTK22X_FOUND)
     message(STATUS "Targeting WebKitGTK 2.2")
     SET(EXTRA_CLIENT_PKG_CONFIG
@@ -602,7 +606,7 @@ add_custom_command(
     WORKING_DIRECTORY
         ${CMAKE_SOURCE_DIR}/bindings/metadata
     COMMAND
-        vapigen --pkg=gio-2.0 --pkg=gtk+-3.0 --pkg=libsoup-2.4 --metadatadir=. 
--metadatadir=${WEBKITGTK_METADATA_DIR} --library=webkitgtk-3.0 --directory=${CMAKE_BINARY_DIR}/src 
`pkg-config --variable=girdir gobject-introspection-1.0`/WebKit-3.0.gir
+        vapigen --pkg=gio-2.0 --pkg=gtk+-3.0 --pkg=libsoup-2.4 --metadatadir=. 
--metadatadir=${WEBKITGTK_METADATA_DIR} --library=webkitgtk-3.0 --directory=${CMAKE_BINARY_DIR}/src 
${WEBKITGTK_CUSTOM_VALA} `pkg-config --variable=girdir gobject-introspection-1.0`/WebKit-3.0.gir
 )
 
 # Geary client app