[gnome-terminal] terminal-window: Remove screen argument from terminal_window_set_size()

[Jasper St. Pierre <jstpierre src gnome org>]

commit 837af8b78edecf1b6498413e8c9549fd6ccbe410
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Fri Jan 18 01:12:34 2013 -0500

    terminal-window: Remove screen argument from terminal_window_set_size()
    
    It's always the active screen.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=691997

 src/terminal-window.c |   34 ++++++++++++++++------------------
 1 files changed, 16 insertions(+), 18 deletions(-)
---
diff --git a/src/terminal-window.c b/src/terminal-window.c
index 4c0e023..66215dc 100644
--- a/src/terminal-window.c
+++ b/src/terminal-window.c
@@ -230,8 +230,7 @@ sync_screen_icon_title (TerminalScreen *screen,
                         GParamSpec *psepc,
                         TerminalWindow *window);
 
-static void terminal_window_set_size (TerminalWindow *window,
-                                      TerminalScreen *screen);
+static void terminal_window_set_size (TerminalWindow *window);
 
 G_DEFINE_TYPE (TerminalWindow, terminal_window, GTK_TYPE_APPLICATION_WINDOW)
 
@@ -863,7 +862,7 @@ terminal_size_to_cb (GtkAction *action,
 
   vte_terminal_set_size (VTE_TERMINAL (priv->active_screen), width, height);
 
-  terminal_window_set_size (window, priv->active_screen);
+  terminal_window_set_size (window);
 }
 
 static void
@@ -1050,10 +1049,8 @@ screen_resize_window_cb (TerminalScreen *screen,
 
   vte_terminal_set_size (terminal, grid_width, grid_height);
 
-  if (screen != priv->active_screen)
-    return;
-
-  terminal_window_set_size (window, screen);
+  if (screen == priv->active_screen)
+    terminal_window_set_size (window);
 }
 
 static void
@@ -1961,10 +1958,9 @@ terminal_window_style_updated (GtkWidget *widget)
   GTK_WIDGET_CLASS (terminal_window_parent_class)->style_updated (widget);
 
   if (priv->active_screen != NULL)
-    {
-      terminal_screen_update_style (priv->active_screen);
-      terminal_window_set_size (window, priv->active_screen);
-    }
+    terminal_screen_update_style (priv->active_screen);
+
+  terminal_window_set_size (window);
 }
 
 static void
@@ -2088,7 +2084,7 @@ terminal_window_show (GtkWidget *widget)
     {
       /* At this point, we have our GdkScreen, and hence the right
        * font size, so we can go ahead and size the window. */
-      terminal_window_set_size (window, priv->active_screen);
+      terminal_window_set_size (window);
     }
 
   GTK_WIDGET_CLASS (terminal_window_parent_class)->show (widget);
@@ -2311,7 +2307,7 @@ terminal_window_set_menubar_visible (TerminalWindow *window,
                              "[window %p] setting size after toggling menubar visibility\n",
                              window);
 
-      terminal_window_set_size (window, priv->active_screen);
+      terminal_window_set_size (window);
     }
 }
 
@@ -2334,13 +2330,15 @@ terminal_window_get_mdi_container (TerminalWindow *window)
 }
 
 static void
-terminal_window_set_size (TerminalWindow *window,
-                          TerminalScreen *screen)
+terminal_window_set_size (TerminalWindow *window)
 {
+  TerminalWindowPrivate *priv = window->priv;
+  int grid_width, grid_height;
+
   /* be sure our geometry is up-to-date */
   terminal_window_update_geometry (window);
 
-  terminal_screen_get_size (screen, &grid_width, &grid_height);
+  terminal_screen_get_size (priv->active_screen, &grid_width, &grid_height);
 
   gtk_window_resize_to_geometry (GTK_WINDOW (window), grid_width, grid_height);
 }
@@ -2477,7 +2475,7 @@ mdi_screen_switched_cb (TerminalMdiContainer *container,
   _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY,
                          "[window %p] setting size after flipping notebook pages\n",
                          window);
-  terminal_window_set_size (window, screen);
+  terminal_window_set_size (window);
 
   terminal_window_update_tabs_menu_sensitivity (window);
   terminal_window_update_encoding_menu_active_encoding (window);
@@ -2606,7 +2604,7 @@ mdi_screen_removed_cb (TerminalMdiContainer *container,
   pages = terminal_mdi_container_get_n_screens (container);
   if (pages == 1)
     {
-      terminal_window_set_size (window, priv->active_screen);
+      terminal_window_set_size (window);
     }
   else if (pages == 0)
     {