[gnome-terminal/gnome-2-28] Make --geometry work again

[Christian Persch <chpe src gnome org>]

commit 9f8b6a3001b5c62e95367131ae9c7bc38a26c751
Author: Christian Persch <chpe gnome org>
Date:   Mon Aug 31 18:11:48 2009 +0200

    Make --geometry work again
    
    Call terminal_window_update_geometry() instead of doing a full
    terminal_window_set_size() call before showing the terminal window. This
    seems to fix bug #592435, without otherwise introducing geometry problems,
    including the reason commit b2e682189b32dda2b0eca105fe1ee057e5e8c544 was
    originally made.

 src/terminal-window.c |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/src/terminal-window.c b/src/terminal-window.c
index 2cdac1b..ffe4b5f 100644
--- a/src/terminal-window.c
+++ b/src/terminal-window.c
@@ -2133,19 +2133,17 @@ terminal_window_show (GtkWidget *widget)
   GdkScreen *screen;
   GdkDisplay *display;
 
+  /* At this point, we have our GdkScreen, and hence the right
+    * font size, so we can go ahead and size the window.
+   */
+  terminal_window_update_geometry (window);
+
   _terminal_debug_print (TERMINAL_DEBUG_GEOMETRY,
                          "[window %p] show, size %d : %d at (%d, %d)\n",
                          widget,
                          widget->allocation.width, widget->allocation.height,
                          widget->allocation.x, widget->allocation.y);
 
-  if (priv->active_screen != NULL)
-    {
-      /* 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, FALSE);
-    }
-
   context = NULL;
   sn_display = NULL;
   if (priv->startup_id != NULL)