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

[xan at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit ae0e2c64f5c95f702ebfd6db8dcccea5a21ab392
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 10 16:16:16 2010 +0000

    WebCore:
    
    2010-09-10  Xan Lopez  <xlopez at igalia.com>
    
            Reviewed by Martin Robinson.
    
            Fix compilation with GTK+ 3.x.
    
            GDK key macros were renamed from GDK_FOO to GDK_KEY_FOO, we need
            to include the compat header provided if we want to keep using the
            old names.
    
            * platform/gtk/GtkVersioning.h: add the compatibility header.
            * platform/gtk/KeyEventGtk.cpp: include GtkVersioning.h
    
    WebKit/gtk:
    
    2010-09-10  Xan Lopez  <xlopez at igalia.com>
    
            Reviewed by Martin Robinson.
    
            Fix compilation with GTK+ 3.x.
    
            GDK key macros were renamed from GDK_FOO to GDK_KEY_FOO, we need
            to include the compat header provided if we want to keep using the
            old names.
    
            * WebCoreSupport/FullscreenVideoController.cpp: include GtkVersioning.h
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67206 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ee94c66..40ffeba 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-10  Xan Lopez  <xlopez at igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        Fix compilation with GTK+ 3.x.
+
+        GDK key macros were renamed from GDK_FOO to GDK_KEY_FOO, we need
+        to include the compat header provided if we want to keep using the
+        old names.
+
+        * platform/gtk/GtkVersioning.h: add the compatibility header.
+        * platform/gtk/KeyEventGtk.cpp: include GtkVersioning.h
+
 2010-09-09  Tony Gentilcore  <tonyg at chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/platform/gtk/GtkVersioning.h b/WebCore/platform/gtk/GtkVersioning.h
index eac3cb5..16de793 100644
--- a/WebCore/platform/gtk/GtkVersioning.h
+++ b/WebCore/platform/gtk/GtkVersioning.h
@@ -23,6 +23,10 @@
 
 #include <gtk/gtk.h>
 
+#ifndef GTK_API_VERSION_2
+#include <gdk/gdkkeysyms-compat.h>
+#endif
+
 G_BEGIN_DECLS
 
 // Macros to avoid deprecation checking churn
diff --git a/WebCore/platform/gtk/KeyEventGtk.cpp b/WebCore/platform/gtk/KeyEventGtk.cpp
index f90647d..50dfa4c 100644
--- a/WebCore/platform/gtk/KeyEventGtk.cpp
+++ b/WebCore/platform/gtk/KeyEventGtk.cpp
@@ -30,6 +30,7 @@
 #include "config.h"
 #include "PlatformKeyboardEvent.h"
 
+#include "GtkVersioning.h"
 #include "NotImplemented.h"
 #include "TextEncoding.h"
 #include "WindowsKeyboardCodes.h"
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 25fe4fd..ed084f8 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-10  Xan Lopez  <xlopez at igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        Fix compilation with GTK+ 3.x.
+
+        GDK key macros were renamed from GDK_FOO to GDK_KEY_FOO, we need
+        to include the compat header provided if we want to keep using the
+        old names.
+
+        * WebCoreSupport/FullscreenVideoController.cpp: include GtkVersioning.h
+
 2010-09-08  Darin Adler  <darin at apple.com>
 
         Reviewed by Adam Barth.
diff --git a/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp b/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp
index c95dcff..cf9a548 100644
--- a/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp
+++ b/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp
@@ -23,6 +23,7 @@
 
 #include "FullscreenVideoController.h"
 
+#include "GtkVersioning.h"
 #include "MediaPlayer.h"
 
 #include <gdk/gdk.h>

-- 
WebKit Debian packaging