[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

mrobinson at webkit.org mrobinson at webkit.org
Wed Dec 22 14:36:33 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 802b24f7aac7a581da9a3d8480e1da2fe9fec248
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 14 01:30:52 2010 +0000

    2010-10-13  Martin Robinson  <mrobinson at igalia.com>
    
            Build fix for older versions of libsoup.
    
            * platform/network/soup/cache/soup-request-file.c:
            (webkit_soup_request_file_ensure_file): Access the path member of the SoupURI directly.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69725 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 89aa41d..58b0313 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-13  Martin Robinson  <mrobinson at igalia.com>
+
+        Build fix for older versions of libsoup.
+
+        * platform/network/soup/cache/soup-request-file.c:
+        (webkit_soup_request_file_ensure_file): Access the path member of the SoupURI directly.
+
 2010-10-13  Kwang Yul Seo  <skyul at company100.net>
 
         Reviewed by Kent Tamura.
diff --git a/WebCore/platform/network/soup/cache/soup-request-file.c b/WebCore/platform/network/soup/cache/soup-request-file.c
index 19dedb6..1203b9e 100644
--- a/WebCore/platform/network/soup/cache/soup-request-file.c
+++ b/WebCore/platform/network/soup/cache/soup-request-file.c
@@ -168,7 +168,7 @@ webkit_soup_request_file_ensure_file (WebKitSoupRequestFile  *file,
 		 * soup_uri_decode when the required libsoup version
 		 * is bumped out to 2.32.1
 		 */
-		gchar *uri_path = soup_uri_get_path (uri);
+		gchar *uri_path = uri->path;
 		gchar *decoded_uri = webkit_soup_request_uri_decoded_copy (uri_path, strlen (uri_path));
 
 		if (decoded_uri) {

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list