Modified: releases/WebKitGTK/webkit-1.8/Source/WebKit/gtk/ChangeLog (112121 => 112122)
--- releases/WebKitGTK/webkit-1.8/Source/WebKit/gtk/ChangeLog 2012-03-26 17:36:22 UTC (rev 112121)
+++ releases/WebKitGTK/webkit-1.8/Source/WebKit/gtk/ChangeLog 2012-03-26 17:37:05 UTC (rev 112122)
@@ -1,3 +1,20 @@
+2012-03-26 Gary Kramlich <[email protected]>
+
+ WebKitWebView signals with GError parameters cause crashes when using GObject Introspection
+ https://bugs.webkit.org/show_bug.cgi?id=81977
+
+ Reviewed by Martin Robinson.
+
+ Added marshalers for BOOLEAN:OBJECT,STRING,BOXED and VOID:OBJECT,OBJECT,BOXED
+ and changed the signal signatures for WebKitWebView::load-fail and
+ WebKitWebView::resource-load-failed to use the new marshalers since
+ GError has been a GBoxed type since Gtk 2.26. This fixes these signals
+ for the gobject-introspection bindings.
+
+ * webkit/webkitwebview.cpp:
+ (webkit_web_view_class_init):
+ * webkitmarshal.list:
+
2012-03-26 Martin Robinson <[email protected]>
[GTK] Replace occurrences of "uri" in the documentation with "URI"
Modified: releases/WebKitGTK/webkit-1.8/Source/WebKit/gtk/webkit/webkitwebview.cpp (112121 => 112122)
--- releases/WebKitGTK/webkit-1.8/Source/WebKit/gtk/webkit/webkitwebview.cpp 2012-03-26 17:36:22 UTC (rev 112121)
+++ releases/WebKitGTK/webkit-1.8/Source/WebKit/gtk/webkit/webkitwebview.cpp 2012-03-26 17:37:05 UTC (rev 112122)
@@ -1990,11 +1990,11 @@
0,
g_signal_accumulator_true_handled,
NULL,
- webkit_marshal_BOOLEAN__OBJECT_STRING_POINTER,
+ webkit_marshal_BOOLEAN__OBJECT_STRING_BOXED,
G_TYPE_BOOLEAN, 3,
WEBKIT_TYPE_WEB_FRAME,
G_TYPE_STRING,
- G_TYPE_POINTER);
+ G_TYPE_ERROR);
/**
* WebKitWebView::load-finished:
@@ -2739,11 +2739,11 @@
G_SIGNAL_RUN_LAST,
0,
0, 0,
- webkit_marshal_VOID__OBJECT_OBJECT_POINTER,
+ webkit_marshal_VOID__OBJECT_OBJECT_BOXED,
G_TYPE_NONE, 3,
WEBKIT_TYPE_WEB_FRAME,
WEBKIT_TYPE_WEB_RESOURCE,
- G_TYPE_POINTER);
+ G_TYPE_ERROR);
/*
* implementations of virtual methods
Modified: releases/WebKitGTK/webkit-1.8/Source/WebKit/gtk/webkitmarshal.list (112121 => 112122)
--- releases/WebKitGTK/webkit-1.8/Source/WebKit/gtk/webkitmarshal.list 2012-03-26 17:36:22 UTC (rev 112121)
+++ releases/WebKitGTK/webkit-1.8/Source/WebKit/gtk/webkitmarshal.list 2012-03-26 17:37:05 UTC (rev 112122)
@@ -7,6 +7,7 @@
BOOLEAN:OBJECT,OBJECT,OBJECT,OBJECT
BOOLEAN:OBJECT,OBJECT,STRING,OBJECT
BOOLEAN:OBJECT,STRING
+BOOLEAN:OBJECT,STRING,BOXED
BOOLEAN:OBJECT,STRING,POINTER
BOOLEAN:OBJECT,STRING,STRING,STRING
BOOLEAN:STRING,INT,STRING
@@ -20,6 +21,7 @@
VOID:OBJECT,OBJECT,INT
VOID:OBJECT,OBJECT,OBJECT
VOID:OBJECT,OBJECT,POINTER
+VOID:OBJECT,OBJECT,BOXED
VOID:OBJECT,OBJECT,OBJECT,OBJECT
VOID:OBJECT,POINTER,POINTER
VOID:OBJECT,INT
