[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[mrobinson at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 6529e1c8875f3274575cff900d0ef1d8b49d9ca6
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 2 16:59:37 2010 +0000

    2010-08-02  Martin Robinson  <mrobinson at igalia.com>
    
            Build fix for building against development versions of GTK+. GTK 2.22
            has not yet been released, so these function definitions must be conditionalized
            on the development version.
    
            * DumpRenderTree/gtk/EventSender.cpp: Fix GTK+ 2.21 build.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64469 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index dbbf9e3..897b97c 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-02  Martin Robinson  <mrobinson at igalia.com>
+
+        Build fix for building against development versions of GTK+. GTK 2.22
+        has not yet been released, so these function definitions must be conditionalized
+        on the development version.
+
+        * DumpRenderTree/gtk/EventSender.cpp: Fix GTK+ 2.21 build.
+
 2010-08-02  Tony Chang  <tony at chromium.org>
 
         Reviewed by Kent Tamura.
diff --git a/WebKitTools/DumpRenderTree/gtk/EventSender.cpp b/WebKitTools/DumpRenderTree/gtk/EventSender.cpp
index 330db46..437ee1b 100644
--- a/WebKitTools/DumpRenderTree/gtk/EventSender.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/EventSender.cpp
@@ -103,7 +103,7 @@ static GdkWindow* gtk_widget_get_window(GtkWidget* widget)
 }
 #endif
 
-#if !GTK_CHECK_VERSION(2, 22, 0)
+#if !GTK_CHECK_VERSION(2, 21, 2)
 static GdkDragAction gdk_drag_context_get_selected_action(GdkDragContext* context)
 {
     g_return_val_if_fail(GDK_IS_DRAG_CONTEXT(context), static_cast<GdkDragAction>(0));

-- 
WebKit Debian packaging