[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 f26e1ee721f2e565997e4e69b5b6a3e8e762d7e8
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 15 19:28:31 2009 +0000

    2009-10-15  Xan Lopez  <xlopez at igalia.com>
    
            Reviewed by Gustavo Noronha.
    
            Protect WebSocket calls in case the feature is not compiled in.
    
            * webkit/webkitwebview.cpp:
            (webkit_web_view_update_settings):
            (webkit_web_view_settings_notify):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49647 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index a423534..538f87b 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,13 @@
+2009-10-15  Xan Lopez  <xlopez at igalia.com>
+
+        Reviewed by Gustavo Noronha.
+
+        Protect WebSocket calls in case the feature is not compiled in.
+
+        * webkit/webkitwebview.cpp:
+        (webkit_web_view_update_settings):
+        (webkit_web_view_settings_notify):
+
 2009-10-15  Zan Dobersek  <zandobersek at gmail.com>
 
         Reviewed by Gustavo Noronha.
diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp
index d354c66..fb2bf35 100644
--- a/WebKit/gtk/webkit/webkitwebview.cpp
+++ b/WebKit/gtk/webkit/webkitwebview.cpp
@@ -2448,7 +2448,9 @@ static void webkit_web_view_update_settings(WebKitWebView* webView)
     settings->setOfflineWebApplicationCacheEnabled(enableOfflineWebAppCache);
     settings->setEditingBehavior(core(editingBehavior));
     settings->setAllowUniversalAccessFromFileURLs(enableUniversalAccessFromFileURI);
+#if ENABLE(WEB_SOCKETS)
     settings->setExperimentalWebSocketsEnabled(enableWebSockets);
+#endif
 
     g_free(defaultEncoding);
     g_free(cursiveFontFamily);
@@ -2535,8 +2537,10 @@ static void webkit_web_view_settings_notify(WebKitWebSettings* webSettings, GPar
         settings->setEditingBehavior(core(static_cast<WebKitEditingBehavior>(g_value_get_enum(&value))));
     else if (name == g_intern_string("enable-universal-access-from-file-uris"))
         settings->setAllowUniversalAccessFromFileURLs(g_value_get_boolean(&value));
+#if ENABLE(WEB_SOCKETS)
     else if (name == g_intern_string("enable-web-sockets"))
         settings->setExperimentalWebSocketsEnabled(g_value_get_boolean(&value));
+#endif
     else if (!g_object_class_find_property(G_OBJECT_GET_CLASS(webSettings), name))
         g_warning("Unexpected setting '%s'", name);
     g_value_unset(&value);

-- 
WebKit Debian packaging