[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[xan at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 949b25543821b5e6b729a569f4e86f9e2cc5e4ef
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Dec 20 18:46:21 2009 +0000

    2009-12-20  Xan Lopez  <xlopez at igalia.com>
    
            Rubber-stamped by Gustavo Noronha.
    
            Disable the page cache by default since:
    
            - It was previously off by default.
            - There are still some issues when enabling it.
    
            * webkit/webkitwebsettings.cpp:
            (webkit_web_settings_class_init):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52424 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 8fb3b71..094ab65 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,15 @@
+2009-12-20  Xan Lopez  <xlopez at igalia.com>
+
+        Rubber-stamped by Gustavo Noronha.
+
+        Disable the page cache by default since:
+
+        - It was previously off by default.
+        - There are still some issues when enabling it.
+
+        * webkit/webkitwebsettings.cpp:
+        (webkit_web_settings_class_init):
+
 2009-12-20  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
         Reviewed by Xan Lopez.
diff --git a/WebKit/gtk/webkit/webkitwebsettings.cpp b/WebKit/gtk/webkit/webkitwebsettings.cpp
index de001b8..0569eee 100644
--- a/WebKit/gtk/webkit/webkitwebsettings.cpp
+++ b/WebKit/gtk/webkit/webkitwebsettings.cpp
@@ -756,7 +756,7 @@ static void webkit_web_settings_class_init(WebKitWebSettingsClass* klass)
                                     g_param_spec_boolean("enable-page-cache",
                                                          _("Enable page cache"),
                                                          _("Whether the page cache should be used"),
-                                                         TRUE,
+                                                         FALSE,
                                                          flags));
 
     g_type_class_add_private(klass, sizeof(WebKitWebSettingsPrivate));

-- 
WebKit Debian packaging