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

[philn at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 011bbeb319f36e296b78587d3485c9cbe68b0751
Author: philn at webkit.org <philn at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 25 09:38:13 2010 +0000

    2010-11-25  Philippe Normand  <pnormand at igalia.com>
    
            Rubber-stamped by Xan Lopez.
    
            g_signal_accumulator_first_wins was introduced in glib 2.27.1 so
            no need to use our version if that version of glib is used during
            the build.
    
            * platform/gtk/GtkVersioning.c:
            * platform/gtk/GtkVersioning.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72722 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1e737dc..f0981a0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-25  Philippe Normand  <pnormand at igalia.com>
+
+        Rubber-stamped by Xan Lopez.
+
+        g_signal_accumulator_first_wins was introduced in glib 2.27.1 so
+        no need to use our version if that version of glib is used during
+        the build.
+
+        * platform/gtk/GtkVersioning.c:
+        * platform/gtk/GtkVersioning.h:
+
 2010-11-24  Jian Li  <jianli at chromium.org>
 
         Reviewed by Kenneth Russell.
diff --git a/WebCore/platform/gtk/GtkVersioning.c b/WebCore/platform/gtk/GtkVersioning.c
index 6d78cd9..c3407ea 100644
--- a/WebCore/platform/gtk/GtkVersioning.c
+++ b/WebCore/platform/gtk/GtkVersioning.c
@@ -263,7 +263,7 @@ gdk_pixbuf_get_from_surface(cairo_surface_t * surface,
 
 #endif // GTK_API_VERSION_2
 
-#if !GLIB_CHECK_VERSION(2, 28, 0)
+#if !GLIB_CHECK_VERSION(2, 27, 1)
 gboolean g_signal_accumulator_first_wins(GSignalInvocationHint *invocationHint, GValue *returnAccumulator, const GValue *handlerReturn, gpointer data)
 {
     g_value_copy(handlerReturn, returnAccumulator);
diff --git a/WebCore/platform/gtk/GtkVersioning.h b/WebCore/platform/gtk/GtkVersioning.h
index 3921669..ea15a54 100644
--- a/WebCore/platform/gtk/GtkVersioning.h
+++ b/WebCore/platform/gtk/GtkVersioning.h
@@ -103,7 +103,7 @@ void gtk_adjustment_set_value(GtkAdjustment* adjusment, gdouble value);
 GdkDevice* getDefaultGDKPointerDevice(GdkWindow* window);
 GdkCursor* blankCursor();
 
-#if !GLIB_CHECK_VERSION(2, 28, 0)
+#if !GLIB_CHECK_VERSION(2, 27, 1)
 gboolean g_signal_accumulator_first_wins(GSignalInvocationHint* invocationHint, GValue* returnAccumulator, const GValue* handlerReturn, gpointer data);
 #endif
 

-- 
WebKit Debian packaging