[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 b1d2f58ddbabd85b97db4d18e69ba6e0ae7a2848
Author: alex at webkit.org <alex at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Dec 5 19:21:56 2010 +0000

    2010-12-05  Alejandro G. Castro  <alex at igalia.com>
    
            Reviewed by Xan Lopez.
    
            [GTK] Fix compilation warnings reported by clang
            https://bugs.webkit.org/show_bug.cgi?id=50252
    
            * platform/graphics/Path.h: CairoPath is now a class, not a
            struct.
            * platform/network/soup/ResourceHandleSoup.cpp:
            (WebCore::sendRequestCallback): Cast the status_code to int.
    
    2010-12-05  Alejandro G. Castro  <alex at igalia.com>
    
            Reviewed by Xan Lopez.
    
            [GTK] Fix compilation warnings reported by clang
            https://bugs.webkit.org/show_bug.cgi?id=50252
    
            * GtkLauncher/main.c:
            (create_window): The create_statusbar function does not have
            parameters.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73344 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 82c48fd..770ca1c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,17 @@
 2010-12-05  Alejandro G. Castro  <alex at igalia.com>
 
+        Reviewed by Xan Lopez.
+
+        [GTK] Fix compilation warnings reported by clang
+        https://bugs.webkit.org/show_bug.cgi?id=50252
+
+        * platform/graphics/Path.h: CairoPath is now a class, not a
+        struct.
+        * platform/network/soup/ResourceHandleSoup.cpp:
+        (WebCore::sendRequestCallback): Cast the status_code to int.
+
+2010-12-05  Alejandro G. Castro  <alex at igalia.com>
+
         Reviewed by Martin Robinson.
 
         [GTK] Remove setColor functions it was replicated in
diff --git a/WebCore/platform/graphics/Path.h b/WebCore/platform/graphics/Path.h
index ba25dc2..423a792 100644
--- a/WebCore/platform/graphics/Path.h
+++ b/WebCore/platform/graphics/Path.h
@@ -46,7 +46,7 @@ class wxGraphicsPath;
 typedef wxGraphicsPath PlatformPath;
 #elif PLATFORM(CAIRO)
 namespace WebCore {
-    struct CairoPath;
+class CairoPath;
 }
 typedef WebCore::CairoPath PlatformPath;
 #elif PLATFORM(SKIA)
diff --git a/WebCore/platform/network/soup/ResourceHandleSoup.cpp b/WebCore/platform/network/soup/ResourceHandleSoup.cpp
index c1933e3..a3ffeb2 100644
--- a/WebCore/platform/network/soup/ResourceHandleSoup.cpp
+++ b/WebCore/platform/network/soup/ResourceHandleSoup.cpp
@@ -492,7 +492,7 @@ static void sendRequestCallback(GObject* source, GAsyncResult* res, gpointer use
         if (isTransportError || (error->domain == G_IO_ERROR)) {
             SoupURI* uri = webkit_soup_request_get_uri(d->m_soupRequest.get());
             GOwnPtr<char> uriStr(soup_uri_to_string(uri, false));
-            gint errorCode = isTransportError ? soupMsg->status_code : error->code;
+            gint errorCode = isTransportError ? static_cast<gint>(soupMsg->status_code) : error->code;
             const gchar* errorMsg = isTransportError ? soupMsg->reason_phrase : error->message;
             const gchar* quarkStr = isTransportError ? g_quark_to_string(SOUP_HTTP_ERROR) : g_quark_to_string(G_IO_ERROR);
             ResourceError resourceError(quarkStr, errorCode, uriStr.get(), String::fromUTF8(errorMsg));
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 191ecd8..653b30e 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-05  Alejandro G. Castro  <alex at igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Fix compilation warnings reported by clang
+        https://bugs.webkit.org/show_bug.cgi?id=50252
+
+        * GtkLauncher/main.c:
+        (create_window): The create_statusbar function does not have
+        parameters.
+
 2010-12-05  Robert Hogan  <robert at webkit.org>
 
         Reviewed by Andreas Kling.
diff --git a/WebKitTools/GtkLauncher/main.c b/WebKitTools/GtkLauncher/main.c
index 4abee08..f79650d 100644
--- a/WebKitTools/GtkLauncher/main.c
+++ b/WebKitTools/GtkLauncher/main.c
@@ -218,7 +218,7 @@ create_window (WebKitWebView** out_web_view)
     uri_entry = gtk_entry_new ();
 
     vbox = gtk_vbox_new (FALSE, 0);
-    statusbar = create_statusbar (web_view);
+    statusbar = create_statusbar ();
     gtk_box_pack_start (GTK_BOX (vbox), create_toolbar (uri_entry, web_view), FALSE, FALSE, 0);
     gtk_box_pack_start (GTK_BOX (vbox), create_browser (window, uri_entry, statusbar, web_view), TRUE, TRUE, 0);
     gtk_box_pack_start (GTK_BOX (vbox), statusbar, FALSE, FALSE, 0);

-- 
WebKit Debian packaging