[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[abarth at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit c5ef2cd5bcc10aac496dfe566637106d7100b850
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 2 03:49:26 2009 +0000

    Typo fix.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51581 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/bindings/v8/ScriptController.cpp b/WebCore/bindings/v8/ScriptController.cpp
index 5c8a22d..eb07abb 100644
--- a/WebCore/bindings/v8/ScriptController.cpp
+++ b/WebCore/bindings/v8/ScriptController.cpp
@@ -294,7 +294,7 @@ bool ScriptController::haveInterpreter() const
 bool ScriptController::isEnabled() const
 {
     Settings* settings = m_proxy->frame()->settings();
-    return m_proxy->frame()->loader()->client()->allowJavaScript(settings && settings->settings->isJavaScriptEnabled() && !m_frame->loader()->isSandboxed(SandboxScripts));
+    return m_proxy->frame()->loader()->client()->allowJavaScript(settings && settings->isJavaScriptEnabled() && !m_frame->loader()->isSandboxed(SandboxScripts));
 }
 
 PassScriptInstance ScriptController::createScriptInstanceForWidget(Widget* widget)

-- 
WebKit Debian packaging