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

[kov at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 991b3f7d5a5217937fe5233b4ad4f341464ee80b
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 24 14:58:45 2010 +0000

    2010-08-24  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
    
            Rubber-stamped by Xan Lopez.
    
            Do not initialize the GSettings object in webkit_init - the other
            call sites are always called in the main thread so this is
            unnecessary.
    
            * webkit/webkitprivate.cpp:
            (webkit_init):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65899 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 209fe58..ec0801c 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-24  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
+
+        Rubber-stamped by Xan Lopez.
+
+        Do not initialize the GSettings object in webkit_init - the other
+        call sites are always called in the main thread so this is
+        unnecessary.
+
+        * webkit/webkitprivate.cpp:
+        (webkit_init):
+
 2010-08-20  Martin Robinson  <mrobinson at igalia.com>
 
         Reviewed by Pavel Feldman.
diff --git a/WebKit/gtk/webkit/webkitprivate.cpp b/WebKit/gtk/webkit/webkitprivate.cpp
index 2dd4b18..1b7f7a3 100644
--- a/WebKit/gtk/webkit/webkitprivate.cpp
+++ b/WebKit/gtk/webkit/webkitprivate.cpp
@@ -284,12 +284,6 @@ void webkit_init()
     // FIXME: Expose this with an API and/or calculate based on available resources
     webkit_set_cache_model(WEBKIT_CACHE_MODEL_WEB_BROWSER);
 
-#ifdef HAVE_GSETTINGS
-    // Initialize settings variables here to make sure this happens in
-    // the main thread.
-    inspectorGSettings();
-#endif
-
 #if ENABLE(DATABASE)
     gchar* databaseDirectory = g_build_filename(g_get_user_data_dir(), "webkit", "databases", NULL);
     webkit_set_web_database_directory_path(databaseDirectory);

-- 
WebKit Debian packaging