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

[alex at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit c8e2739061eced3147511be086f1f4237ab19ecd
Author: alex at webkit.org <alex at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 14 16:13:06 2010 +0000

    2010-10-14  Alejandro G. Castro  <alex at igalia.com>
    
            Reviewed by Martin Robinson.
    
            Fixed crashes in the GTK 64bits bot, we have to use NULL instead
            of 0 when calling these glib APIs, 0 is compiled as a char and in
            64bits systems it is not correct.
    
            * platform/network/soup/cache/soup-requester.c:
            (webkit_soup_requester_new):
            (webkit_soup_requester_request_uri):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69768 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 07735ea..50d81b6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-14  Alejandro G. Castro  <alex at igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        Fixed crashes in the GTK 64bits bot, we have to use NULL instead
+        of 0 when calling these glib APIs, 0 is compiled as a char and in
+        64bits systems it is not correct.
+
+        * platform/network/soup/cache/soup-requester.c:
+        (webkit_soup_requester_new):
+        (webkit_soup_requester_request_uri):
+
 2010-10-14  Daniel Bates  <dbates at rim.com>
 
         Attempt to fix the Qt and GTK builds based on the build bot results from <http://webkit.sed.hu>.
diff --git a/WebCore/platform/network/soup/cache/soup-requester.c b/WebCore/platform/network/soup/cache/soup-requester.c
index 6ce89d9..4d8a860 100644
--- a/WebCore/platform/network/soup/cache/soup-requester.c
+++ b/WebCore/platform/network/soup/cache/soup-requester.c
@@ -86,7 +86,7 @@ static void init_request_types (WebKitSoupRequesterPrivate *priv)
 
 WebKitSoupRequester *webkit_soup_requester_new (void)
 {
-	return (WebKitSoupRequester *)g_object_new (WEBKIT_TYPE_SOUP_REQUESTER, 0);
+	return (WebKitSoupRequester *)g_object_new (WEBKIT_TYPE_SOUP_REQUESTER, NULL);
 }
 
 WebKitSoupRequest *webkit_soup_requester_request (WebKitSoupRequester *requester, const char *uriString, SoupSession *session, GError **error)
@@ -124,12 +124,12 @@ WebKitSoupRequest *webkit_soup_requester_request_uri (WebKitSoupRequester *reque
 		return (WebKitSoupRequest *)g_initable_new (requestType, 0, error,
 							    "uri", uri,
 							    "session", session,
-							    0);
+							    NULL);
 	} else {
 		return (WebKitSoupRequest *)g_object_new (requestType,
 							  "uri", uri,
 							  "session", session,
-							  0);
+							  NULL);
 	}
 }
 

-- 
WebKit Debian packaging