[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[mrobinson at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 177f0a0f6afd8199953fb75eb28251cf79460517
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 29 22:34:37 2010 +0000

    2010-12-29  Martin Robinson  <mrobinson at igalia.com>
    
            [GTK] GSettings warning is concealing real warnings on the build bots
            https://bugs.webkit.org/show_bug.cgi?id=51691
    
            Reviewed by Xan Lopez.
    
            Do not print the GSettings warning message when running in DumpRenderTree.
    
            * webkit/webkitwebinspector.cpp:
            (inspectorGSettings): Do not print the GSettings warning if we are running
            in DumpRenderTree. This should clean up the test results page a great deal.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74762 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index f8c84e2..fe93a8d 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-29  Martin Robinson  <mrobinson at igalia.com>
+
+        [GTK] GSettings warning is concealing real warnings on the build bots
+        https://bugs.webkit.org/show_bug.cgi?id=51691
+
+        Reviewed by Xan Lopez.
+
+        Do not print the GSettings warning message when running in DumpRenderTree.
+
+        * webkit/webkitwebinspector.cpp:
+        (inspectorGSettings): Do not print the GSettings warning if we are running
+        in DumpRenderTree. This should clean up the test results page a great deal.
+
 2010-12-28  Martin Robinson  <mrobinson at igalia.com>
 
         Reviewed by Xan Lopez.
diff --git a/WebKit/gtk/webkit/webkitwebinspector.cpp b/WebKit/gtk/webkit/webkitwebinspector.cpp
index ad455bb..7f0b3ed 100644
--- a/WebKit/gtk/webkit/webkitwebinspector.cpp
+++ b/WebKit/gtk/webkit/webkitwebinspector.cpp
@@ -596,23 +596,23 @@ static bool isSchemaAvailable(const char* schemaID)
 GSettings* inspectorGSettings()
 {
     static GSettings* settings = 0;
-
     if (settings)
         return settings;
 
+    // Unfortunately GSettings will abort the process execution if the schema is not
+    // installed, which is the case for when running tests, or even the introspection dump
+    // at build time, so check if we have the schema before trying to initialize it.
     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
-    // tests, or even the introspection dump at build time, so check
-    // if we have the schema before trying to initialize it.
     if (!isSchemaAvailable(schemaID)) {
-        g_warning("GSettings schema not found - settings will not be used or saved.");
+
+        // This warning is very common on the build bots, which hides valid warnings.
+        // Skip printing it if we are running inside DumpRenderTree.
+        if (!DumpRenderTreeSupportGtk::dumpRenderTreeModeEnabled())
+            g_warning("GSettings schema not found - settings will not be used or saved.");
         return 0;
     }
 
     settings = g_settings_new(schemaID);
-
     return settings;
 }
 #endif

-- 
WebKit Debian packaging