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

[xan at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 37c123e675b8f06bef4ab2b02c4e8c3baf720abb
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 18 03:08:03 2010 +0000

    2010-08-17  Xan Lopez  <xlopez at igalia.com>
    
            Reviewed by Gustavo Noronha.
    
            Fix the builds when HAVE_GSETTINGS is defined.
    
            * webkit/webkitprivate.cpp:
            (isSchemaAvailable):
            (inspectorGSettings):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65585 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index cbf4b73..dabddaa 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-17  Xan Lopez  <xlopez at igalia.com>
+
+        Reviewed by Gustavo Noronha.
+
+        Fix the builds when HAVE_GSETTINGS is defined.
+
+        * webkit/webkitprivate.cpp:
+        (isSchemaAvailable):
+        (inspectorGSettings):
+
 2010-08-17  Jesus Sanchez-Palencia  <jesus.palencia at openbossa.org>
 
         Reviewed by Darin Adler.
diff --git a/WebKit/gtk/webkit/webkitprivate.cpp b/WebKit/gtk/webkit/webkitprivate.cpp
index 027c4ce..91b2904 100644
--- a/WebKit/gtk/webkit/webkitprivate.cpp
+++ b/WebKit/gtk/webkit/webkitprivate.cpp
@@ -216,7 +216,7 @@ static void closeIconDatabaseOnExit()
 }
 
 #ifdef HAVE_GSETTINGS
-static bool isSchemaAvailable(char* schemaID)
+static bool isSchemaAvailable(const char* schemaID)
 {
     const char* const* availableSchemas = g_settings_list_schemas();
     char* const* iter = const_cast<char* const*>(availableSchemas);
@@ -237,7 +237,7 @@ GSettings* inspectorGSettings()
     if (settings)
         return settings;
 
-    const gchar* schemaID = "org.webkitgtk-"WEBKITGTK_API_VERSION_STRING".inspector"
+    const gchar* schemaID = "org.webkitgtk-"WEBKITGTK_API_VERSION_STRING".inspector";
 
     // Unfortunately GSettings will abort the process execution if the
     // schema is not installed, which is the case for when running

-- 
WebKit Debian packaging