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

[philn at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 056392258c10e88b2014ca85a19f419f00af7017
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 15 08:34:45 2010 +0000

    2010-03-09  Philippe Normand  <pnormand at igalia.com>
    
            Reviewed by Holger Freyther.
    
            [GTK] GTK_WIDGET_IS_SENSITIVE is deprecated in GTK+ 2.20
            https://bugs.webkit.org/show_bug.cgi?id=35909
    
            * webkit/webkitwebview.cpp: GTK_WIDGET_IS_SENSITIVE has been
            deprecated in gtk 2.20. Use gtk_widget_is_sensitive when available.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55989 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 26fa51b..8cffe90 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-09  Philippe Normand  <pnormand at igalia.com>
+
+        Reviewed by Holger Freyther.
+
+        [GTK] GTK_WIDGET_IS_SENSITIVE is deprecated in GTK+ 2.20
+        https://bugs.webkit.org/show_bug.cgi?id=35909
+
+        * webkit/webkitwebview.cpp: GTK_WIDGET_IS_SENSITIVE has been
+        deprecated in gtk 2.20. Use gtk_widget_is_sensitive when available.
+
 2010-03-12  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
         Rubber-stamped by Kenneth Rohde Christiansen.
diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp
index e2a4017..81ce502 100644
--- a/WebKit/gtk/webkit/webkitwebview.cpp
+++ b/WebKit/gtk/webkit/webkitwebview.cpp
@@ -688,7 +688,12 @@ static void webkit_web_view_size_allocate(GtkWidget* widget, GtkAllocation* allo
 
 static void webkit_web_view_grab_focus(GtkWidget* widget)
 {
+
+#if GTK_CHECK_VERSION(2, 18, 0)
+    if (gtk_widget_is_sensitive(widget)) {
+#else
     if (GTK_WIDGET_IS_SENSITIVE(widget)) {
+#endif
         WebKitWebView* webView = WEBKIT_WEB_VIEW(widget);
         FocusController* focusController = core(webView)->focusController();
 

-- 
WebKit Debian packaging