[gtk+] Fix double accounting of border width

[Matthias Clasen <matthiasc src gnome org>]

commit 2fe07c9068b1ad399c9162d2199802f200b03f64
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Mar 17 19:00:13 2013 -0400

    Fix double accounting of border width
    
    For csd, we were subtracting the border width one too many
    times from the child height, causing clipped off content e.g.
    in the 'Properties' window in testgtk.

 gtk/gtkwindow.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 59598b5..0595114 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -6073,7 +6073,9 @@ _gtk_window_set_allocation (GtkWindow           *window,
                             title_border.top +
                             title_border.bottom;
       child_allocation.width -= window_border.left + window_border.right;
-      child_allocation.height -= child_allocation.y + window_border.bottom;
+      child_allocation.height -= window_border.top + window_border.bottom +
+                                title_border.top + title_border.bottom +
+                                title_height;
     }
 
   if (gtk_widget_get_realized (widget))