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

[kov at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 3aaa46036bc966bdb37d5a41851ba2e159e71bea
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 9 11:18:48 2010 +0000

    2010-12-09  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
    
            Build fix for GTK+3. Use functions added for GTK+ 2.24 to get the
            GDK window size.
    
            * plugins/gtk/gtk2xtbin.c:
            (gtk_xtbin_realize):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73603 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 551ce33..06b48b8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-12-09  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
+
+        Build fix for GTK+3. Use functions added for GTK+ 2.24 to get the
+        GDK window size.
+
+        * plugins/gtk/gtk2xtbin.c:
+        (gtk_xtbin_realize):
+
 2010-12-09  Siddharth Mathur  <siddharth.mathur at nokia.com>
 
         Reviewed by Laszlo Gombos.
diff --git a/WebCore/plugins/gtk/gtk2xtbin.c b/WebCore/plugins/gtk/gtk2xtbin.c
index f668bff..e03fad3 100644
--- a/WebCore/plugins/gtk/gtk2xtbin.c
+++ b/WebCore/plugins/gtk/gtk2xtbin.c
@@ -274,7 +274,6 @@ gtk_xtbin_realize (GtkWidget *widget)
 #if GTK_CHECK_VERSION(2, 18, 0)
   GtkAllocation widget_allocation;
 #endif
-  gint  x, y, w, h, d; /* geometry of window */
 
 #ifdef DEBUG_XTBIN
   printf("gtk_xtbin_realize()\n");
@@ -285,9 +284,15 @@ gtk_xtbin_realize (GtkWidget *widget)
   xtbin = GTK_XTBIN (widget);
 
   /* caculate the allocation before realize */
+#if GTK_CHECK_VERSION(2, 24, 0)
+  allocation.width = gdk_window_get_width(xtbin->parent_window);
+  allocation.height = gdk_window_get_height(xtbin->parent_window);
+#else
+  gint  x, y, w, h, d; /* geometry of window */
   gdk_window_get_geometry(xtbin->parent_window, &x, &y, &w, &h, &d);
   allocation.width = w;
   allocation.height = h;
+#endif
   gtk_widget_size_allocate (widget, &allocation);
 
 #ifdef DEBUG_XTBIN

-- 
WebKit Debian packaging