[webkit-changes] [112111] trunk/Source/WebKit/gtk

Mon, 26 Mar 2012 09:24:55 -0700

Title: [112111] trunk/Source/WebKit/gtk
Revision
112111
Author
[email protected]
Date
2012-03-26 09:24:49 -0700 (Mon, 26 Mar 2012)

Log Message

WebKitWebView signals with GError parameters cause crashes when using GObject Introspection
https://bugs.webkit.org/show_bug.cgi?id=81977

Patch by Gary Kramlich <[email protected]> on 2012-03-26
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:

Modified Paths

Diff

Modified: trunk/Source/WebKit/gtk/ChangeLog (112110 => 112111)


--- trunk/Source/WebKit/gtk/ChangeLog	2012-03-26 16:24:43 UTC (rev 112110)
+++ trunk/Source/WebKit/gtk/ChangeLog	2012-03-26 16:24:49 UTC (rev 112111)
@@ -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-24  Martin Robinson  <[email protected]>
 
         [GTK] Replace occurrences of "uri" in the documentation with "URI"

Modified: trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp (112110 => 112111)


--- trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp	2012-03-26 16:24:43 UTC (rev 112110)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp	2012-03-26 16:24:49 UTC (rev 112111)
@@ -2037,11 +2037,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:
@@ -2841,11 +2841,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);
 
     /**
      * WebKitWebView::context-menu:

Modified: trunk/Source/WebKit/gtk/webkitmarshal.list (112110 => 112111)


--- trunk/Source/WebKit/gtk/webkitmarshal.list	2012-03-26 16:24:43 UTC (rev 112110)
+++ trunk/Source/WebKit/gtk/webkitmarshal.list	2012-03-26 16:24:49 UTC (rev 112111)
@@ -8,6 +8,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
@@ -21,6 +22,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

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to