[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[philn at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 6f43e22c7afb410f8ea6ba5b71f4164954544808
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 3 08:24:23 2010 +0000

    2010-03-03  Philippe Normand  <pnormand at igalia.com>
    
            Unreviewed, build fix after r55452.
    
            * webkit/webkitwebview.cpp:
            (DNDContentsRequest::webkit_web_view_settings_notify): added missing braces.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55454 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 4284ed3..4db23d9 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,10 @@
+2010-03-03  Philippe Normand  <pnormand at igalia.com>
+
+        Unreviewed, build fix after r55452.
+
+        * webkit/webkitwebview.cpp:
+        (DNDContentsRequest::webkit_web_view_settings_notify): added missing braces.
+
 2010-03-02  Eric Uhrhane  <ericu at chromium.org>
 
         Reviewed by David Levin.
diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp
index 8528949..c6f978a 100644
--- a/WebKit/gtk/webkit/webkitwebview.cpp
+++ b/WebKit/gtk/webkit/webkitwebview.cpp
@@ -2821,9 +2821,10 @@ static void webkit_web_view_settings_notify(WebKitWebSettings* webSettings, GPar
     else if (name == g_intern_string("enable-caret-browsing"))
         settings->setCaretBrowsingEnabled(g_value_get_boolean(&value));
 #if ENABLE(DATABASE)
-    else if (name == g_intern_string("enable-html5-database"))
+    else if (name == g_intern_string("enable-html5-database")) {
         settings->setDatabasesEnabled(g_value_get_boolean(&value));
         Database::setIsAvailable(g_value_get_boolean(&value));
+    }
 #endif
     else if (name == g_intern_string("enable-html5-local-storage"))
         settings->setLocalStorageEnabled(g_value_get_boolean(&value));

-- 
WebKit Debian packaging