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

[alex at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 6eb3f662c83bbdc040f03e470b9387f14577ab0d
Author: alex at webkit.org <alex at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 8 10:22:44 2010 +0000

    2010-12-08  Alejandro G. Castro  <alex at igalia.com>
    
            Reviewed by Gustavo Noronha Silva.
    
            Fix assertion in the API test, we are requesting the favicon and
            the subresource so we have to make sure we are assigning just the
            first subresource.
    
            * tests/testwebresource.c:
            (resource_request_starting_sub_cb):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73497 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 9e8acb5..9ef018b 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-08  Alejandro G. Castro  <alex at igalia.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Fix assertion in the API test, we are requesting the favicon and
+        the subresource so we have to make sure we are assigning just the
+        first subresource.
+
+        * tests/testwebresource.c:
+        (resource_request_starting_sub_cb):
+
 2010-12-07  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
         Reviewed by Martin Robinson.
diff --git a/WebKit/gtk/tests/testwebresource.c b/WebKit/gtk/tests/testwebresource.c
index 81457a4..4a16a03 100644
--- a/WebKit/gtk/tests/testwebresource.c
+++ b/WebKit/gtk/tests/testwebresource.c
@@ -218,8 +218,8 @@ static void resource_request_starting_sub_cb(WebKitWebView* web_view, WebKitWebF
 {
     if (!main_resource)
         main_resource = g_object_ref(web_resource);
-    else
-        sub_resource = g_object_ref(web_resource);
+    else if (!sub_resource)
+      sub_resource = g_object_ref(web_resource);
 }
 
 static void notify_load_status_sub_cb(WebKitWebView* web_view, GParamSpec* pspec, gpointer data)

-- 
WebKit Debian packaging