[vte] Use the set column/row size even when we don't have a PTY

[Christian Persch <chpe src gnome org>]

commit 26771370d12c58d5876aa7e0d8b7c6acd2698189
Author: Christian Persch <chpe gnome org>
Date:   Thu Mar 25 14:16:55 2010 +0100

    Use the set column/row size even when we don't have a PTY
    
    Bug #317158.

 src/vte.c |   23 +++++------------------
 1 files changed, 5 insertions(+), 18 deletions(-)
---
diff --git a/src/vte.c b/src/vte.c
index aec2c85..76d7032 100644
--- a/src/vte.c
+++ b/src/vte.c
@@ -8202,18 +8202,9 @@ vte_terminal_size_request(GtkWidget *widget, GtkRequisition *requisition)
 
 	vte_terminal_ensure_font (terminal);
 
-	if (terminal->pvt->pty != NULL) {
-		vte_terminal_refresh_size(terminal);
-		requisition->width = terminal->char_width *
-			terminal->column_count;
-		requisition->height = terminal->char_height *
-			terminal->row_count;
-	} else {
-		requisition->width = terminal->char_width *
-			terminal->pvt->default_column_count;
-		requisition->height = terminal->char_height *
-			terminal->pvt->default_row_count;
-	}
+        vte_terminal_refresh_size(terminal);
+        requisition->width = terminal->char_width * terminal->column_count;
+        requisition->height = terminal->char_height * terminal->row_count;
 
 	requisition->width += terminal->pvt->inner_border.left +
                               terminal->pvt->inner_border.right;
@@ -8224,12 +8215,8 @@ vte_terminal_size_request(GtkWidget *widget, GtkRequisition *requisition)
 			"[Terminal %p] Size request is %dx%d for %ldx%ld cells.\n",
                         terminal,
 			requisition->width, requisition->height,
-			(terminal->pvt->pty != NULL) ?
-			terminal->column_count :
-			terminal->pvt->default_column_count,
-			(terminal->pvt->pty != NULL) ?
-			terminal->row_count :
-			terminal->pvt->default_row_count);
+			terminal->column_count,
+			terminal->row_count);
 }
 
 /* Accept a given size from GTK+. */