[totem/gnome-2-30] Fix window height when showing controls again

[Bastien Nocera <hadess src gnome org>]

commit 0363ed723bef88b9fd134c8a8070c5655b450aa0
Author: Sean Neakums <sneakums ondioline org>
Date:   Tue Apr 27 17:26:12 2010 +0100

    Fix window height when showing controls again
    
    Fix regression due to commit eb74e996
    
    When hiding and then showing the controls again with the 'H'
    hotkey, the window height will be huge, because the wrong
    allocation was used to calculate the new window height.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=614514

 src/totem-object.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/totem-object.c b/src/totem-object.c
index 57af6e8..0a2e7e6 100644
--- a/src/totem-object.c
+++ b/src/totem-object.c
@@ -2863,9 +2863,9 @@ show_controls (Totem *totem, gboolean was_fullscreen)
 			gtk_widget_get_allocation (menubar, &allocation_menubar);
 			gtk_widget_get_allocation (controlbar, &allocation_controlbar);
 			gtk_widget_get_allocation (statusbar, &allocation_statusbar);
-			height += allocation.height
-				+ allocation.height
-				+ allocation.height
+			height += allocation_menubar.height
+				+ allocation_controls.height
+				+ allocation_statusbar.height
 				+ 2 * BVW_VBOX_BORDER_WIDTH;
 			width += 2 * BVW_VBOX_BORDER_WIDTH;
 			gtk_window_resize (GTK_WINDOW(totem->win),