[gnome-terminal/gnome-3-6] window: Use the geometry of the active screen

[Christian Persch <chpe src gnome org>]

commit b04657461f4e457b72a1f5ca13c0475b386a471a
Author: Christian Persch <chpe gnome org>
Date:   Wed Jan 16 22:52:03 2013 +0100

    window: Use the geometry of the active screen
    
    When we get the restyle on focus-out, the screens call terminal_window_set_size()
    directly. This was causing the window to revert to a previous size, see bug
    https://bugzilla.gnome.org/show_bug.cgi?id=688959 .
    (cherry picked from commit 611e93f2f8c0c18ed8d365ecb850258e8d5c9c12)

 src/terminal-window.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/src/terminal-window.c b/src/terminal-window.c
index 35272c2..033d7c9 100644
--- a/src/terminal-window.c
+++ b/src/terminal-window.c
@@ -2572,6 +2572,10 @@ terminal_window_set_size_force_grid (TerminalWindow *window,
   int grid_width;
   int grid_height;
 
+  /* Only update the geometry from the active screen. */
+  if (window->priv->active_screen != screen)
+    return;
+
   /* be sure our geometry is up-to-date */
   terminal_window_update_geometry (window);