[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[xan at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit e67c38091445fd42b14b4ff0e50fbaae2d2ef379
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 29 09:48:56 2009 +0000

    2009-09-29  Xan Lopez  <xlopez at igalia.com>
    
            Unreviewed attempt to fix the build.
    
            * page/Settings.cpp:
            (WebCore::Settings::Settings):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48865 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index aa6c183..342d498 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2009-09-29  Xan Lopez  <xlopez at igalia.com>
+
+        Unreviewed attempt to fix the build.
+
+        * page/Settings.cpp:
+        (WebCore::Settings::Settings):
+
 2009-09-28  Fumitoshi Ukai  <ukai at chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/page/Settings.cpp b/WebCore/page/Settings.cpp
index 65145f4..4426587 100644
--- a/WebCore/page/Settings.cpp
+++ b/WebCore/page/Settings.cpp
@@ -117,7 +117,9 @@ Settings::Settings(Page* page)
     , m_acceleratedCompositingEnabled(true)
     , m_experimentalNotificationsEnabled(false)
     , m_pluginHalterEnabled(false)
+#if ENABLE(WEB_SOCKETS)
     , m_experimentalWebSocketsEnabled(false)
+#endif
 {
     // A Frame may not have been created yet, so we initialize the AtomicString 
     // hash before trying to use it.

-- 
WebKit Debian packaging