Diff
Modified: trunk/Source/WebKit2/ChangeLog (161804 => 161805)
--- trunk/Source/WebKit2/ChangeLog 2014-01-12 07:31:52 UTC (rev 161804)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-12 08:45:48 UTC (rev 161805)
@@ -1,3 +1,17 @@
+2014-01-12 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Fix return value of WebKitDownload::created-destination
+ https://bugs.webkit.org/show_bug.cgi?id=126741
+
+ Reviewed by Martin Robinson.
+
+ WebKitDownload::created-destination signal should be void instead
+ of gboolean. This doesn't break the API/ABI.
+
+ * UIProcess/API/gtk/WebKitDownload.cpp:
+ (webkit_download_class_init):
+ (webkitDownloadDestinationCreated):
+
2014-01-11 Yongjun Zhang <[email protected]>
Support bool argument for encoding/decoding invocations.
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp (161804 => 161805)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp 2014-01-12 07:31:52 UTC (rev 161804)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp 2014-01-12 08:45:48 UTC (rev 161805)
@@ -264,13 +264,14 @@
* created successfully at @destination.
*/
signals[CREATED_DESTINATION] =
- g_signal_new("created-destination",
- G_TYPE_FROM_CLASS(objectClass),
- G_SIGNAL_RUN_LAST,
- 0, 0, 0,
- g_cclosure_marshal_VOID__STRING,
- G_TYPE_BOOLEAN, 1,
- G_TYPE_STRING);
+ g_signal_new(
+ "created-destination",
+ G_TYPE_FROM_CLASS(objectClass),
+ G_SIGNAL_RUN_LAST,
+ 0, 0, 0,
+ g_cclosure_marshal_VOID__STRING,
+ G_TYPE_NONE, 1,
+ G_TYPE_STRING);
}
WebKitDownload* webkitDownloadCreate(DownloadProxy* downloadProxy)
@@ -382,8 +383,7 @@
{
if (download->priv->isCancelled)
return;
- gboolean returnValue;
- g_signal_emit(download, signals[CREATED_DESTINATION], 0, destinationURI.data(), &returnValue);
+ g_signal_emit(download, signals[CREATED_DESTINATION], 0, destinationURI.data(), nullptr);
}
/**
Modified: trunk/Tools/ChangeLog (161804 => 161805)
--- trunk/Tools/ChangeLog 2014-01-12 07:31:52 UTC (rev 161804)
+++ trunk/Tools/ChangeLog 2014-01-12 08:45:48 UTC (rev 161805)
@@ -1,3 +1,13 @@
+2014-01-12 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Fix return value of WebKitDownload::created-destination
+ https://bugs.webkit.org/show_bug.cgi?id=126741
+
+ Reviewed by Martin Robinson.
+
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestDownloads.cpp: Fix return
+ value of several callbacks.
+
2014-01-11 Sam Weinig <[email protected]>
Add support for null StringViews
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDownloads.cpp (161804 => 161805)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDownloads.cpp 2014-01-12 07:31:52 UTC (rev 161804)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDownloads.cpp 2014-01-12 08:45:48 UTC (rev 161805)
@@ -52,31 +52,27 @@
test->receivedResponse(download);
}
- static gboolean createdDestinationCallback(WebKitDownload* download, const gchar* destination, DownloadTest* test)
+ static void createdDestinationCallback(WebKitDownload* download, const gchar* destination, DownloadTest* test)
{
g_assert(webkit_download_get_destination(download));
g_assert_cmpstr(webkit_download_get_destination(download), ==, destination);
test->createdDestination(download, destination);
- return TRUE;
}
- static gboolean receivedDataCallback(WebKitDownload* download, guint64 dataLength, DownloadTest* test)
+ static void receivedDataCallback(WebKitDownload* download, guint64 dataLength, DownloadTest* test)
{
test->receivedData(download, dataLength);
- return TRUE;
}
- static gboolean finishedCallback(WebKitDownload* download, DownloadTest* test)
+ static void finishedCallback(WebKitDownload* download, DownloadTest* test)
{
test->finished(download);
- return TRUE;
}
- static gboolean failedCallback(WebKitDownload* download, GError* error, DownloadTest* test)
+ static void failedCallback(WebKitDownload* download, GError* error, DownloadTest* test)
{
g_assert(error);
test->failed(download, error);
- return TRUE;
}
static gboolean decideDestinationCallback(WebKitDownload* download, const gchar* suggestedFilename, DownloadTest* test)
