[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 da6ca9d9d4970fe5a784cf551b34011bd3dcde7e
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 10 16:16:42 2010 +0000

    2010-09-10  Xan Lopez  <xlopez at igalia.com>
    
            Reviewed by Martin Robinson.
    
            GDK_DISPLAY was removed in GTK+ 3.x, re-declare it when built
            against that.
    
            * platform/gtk/GtkVersioning.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67207 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 40ffeba..7a2c69c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,15 @@
 
         Reviewed by Martin Robinson.
 
+        GDK_DISPLAY was removed in GTK+ 3.x, re-declare it when built
+        against that.
+
+        * platform/gtk/GtkVersioning.h:
+
+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
diff --git a/WebCore/platform/gtk/GtkVersioning.h b/WebCore/platform/gtk/GtkVersioning.h
index 16de793..2c6b00a 100644
--- a/WebCore/platform/gtk/GtkVersioning.h
+++ b/WebCore/platform/gtk/GtkVersioning.h
@@ -30,6 +30,10 @@
 G_BEGIN_DECLS
 
 // Macros to avoid deprecation checking churn
+#ifndef GTK_API_VERSION_2
+#define GDK_DISPLAY() (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()))
+#endif
+
 #if !GTK_CHECK_VERSION(2, 21, 2)
 #define gdk_visual_get_depth(visual) (visual)->depth
 #define gdk_visual_get_bits_per_rgb(visual) (visual)->bits_per_rgb

-- 
WebKit Debian packaging