[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[philn at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 868969b91ae3945d1a3f7272cc48ea44f522802d
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 4 09:43:36 2011 +0000

    2011-01-04  Sheriff Bot  <webkit.review.bot at gmail.com>
    
            Unreviewed, rolling out r74961.
            http://trac.webkit.org/changeset/74961
            https://bugs.webkit.org/show_bug.cgi?id=51867
    
            breaks 32/64-bits debug bots build (Requested by philn-tp on
            #webkit).
    
            * platform/graphics/gstreamer/GStreamerGWorld.cpp:
            (WebCore::GStreamerGWorld::setWindowOverlay):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74962 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ce38557..3ca13dc 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-04  Sheriff Bot  <webkit.review.bot at gmail.com>
+
+        Unreviewed, rolling out r74961.
+        http://trac.webkit.org/changeset/74961
+        https://bugs.webkit.org/show_bug.cgi?id=51867
+
+        breaks 32/64-bits debug bots build (Requested by philn-tp on
+        #webkit).
+
+        * platform/graphics/gstreamer/GStreamerGWorld.cpp:
+        (WebCore::GStreamerGWorld::setWindowOverlay):
+
 2011-01-03  Philippe Normand  <pnormand at igalia.com>
 
         Rubber-stamped by Eric Seidel.
diff --git a/WebCore/platform/graphics/gstreamer/GStreamerGWorld.cpp b/WebCore/platform/graphics/gstreamer/GStreamerGWorld.cpp
index 2a27db0..e8c87ac 100644
--- a/WebCore/platform/graphics/gstreamer/GStreamerGWorld.cpp
+++ b/WebCore/platform/graphics/gstreamer/GStreamerGWorld.cpp
@@ -210,10 +210,7 @@ void GStreamerGWorld::setWindowOverlay(GstMessage* message)
 
     if (m_videoWindow) {
         m_videoWindow->prepareForOverlay(message);
-
-// gst_x_overlay_set_window_handle was introduced in -plugins-base
-// 0.10.31, just like the macro for checking the version.
-#ifdef GST_CHECK_PLUGINS_BASE_VERSION
+#if GST_CHECK_VERSION(0, 10, 31) || GST_VERSION_NANO
         gst_x_overlay_set_window_handle(GST_X_OVERLAY(sink), m_videoWindow->videoWindowId());
 #else
         gst_x_overlay_set_xwindow_id(GST_X_OVERLAY(sink), m_videoWindow->videoWindowId());

-- 
WebKit Debian packaging