[gnome-terminal] Make --geometry work again

[Christian Persch <chpe src gnome org>]

commit 549e45a7ecafcfa6ee28685e1181f2ba3f0e67d1
Author: Christian Persch <chpe gnome org>
Date:   Thu Aug 27 20:37:58 2009 +0200

    Make --geometry work again
    
    When showing the TerminalWindow, only call
    terminal_window_update_geometry() not terminal_window_set_size(). This
    seems to fix bug #592435.

 src/terminal-window.c |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/src/terminal-window.c b/src/terminal-window.c
index c1b8662..b6fcf2c 100644
--- a/src/terminal-window.c
+++ b/src/terminal-window.c
@@ -2109,20 +2109,24 @@ static void
 terminal_window_show (GtkWidget *widget)
 {
   TerminalWindow *window = TERMINAL_WINDOW (widget);
+#if 0
   TerminalWindowPrivate *priv = window->priv;
 
-  _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);
     }
+#endif
+
+  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);
 
   GTK_WIDGET_CLASS (terminal_window_parent_class)->show (widget);
 }