- Revert gnome.org #336325 (fixes #338913 – Terminal resized when

switching tabs)

gnome-terminal-2.15.0-338913-revert-336325.patch

@@ -0,0 +1,22 @@
+Index: gnome-terminal-2.15.0/src/terminal-window.c
+===================================================================
+RCS file: /cvs/gnome/gnome-terminal/src/terminal-window.c,v
+retrieving revision 1.124
+diff -u -p -d -r1.124 terminal-window.c
+--- gnome-terminal-2.15.0/src/terminal-window.c	4 Mar 2006 06:21:01 -0000	1.124
++++ gnome-terminal-2.15.0/src/terminal-window.c	1 Apr 2006 03:11:46 -0000
+@@ -1536,6 +1536,14 @@ terminal_window_set_size_force_grid (Ter
+   app = gtk_widget_get_toplevel (widget);
+   g_assert (app != NULL);
+ 
++  /* This set_size_request hack is because the extra size above base
++   * size should only include the width of widgets that intersect the
++   * term vertically and the height of widgets that intersect the term
++   * horizontally. It works around a GTK bug, GTK should handle
++   * this case. The size request can be huge without hosing
++   * anything because we set the MIN_SIZE geometry hint.
++   */
++  gtk_widget_set_size_request (widget, 2000, 2000);
+   gtk_widget_size_request (app, &toplevel_request);
+   gtk_widget_size_request (widget, &widget_request);
+ 

gnome-terminal.spec

@@ -13,13 +13,15 @@
 Summary: GNOME Terminal
 Name: gnome-terminal
 Version: 2.15.0
-Release: 1
+Release: 2
 URL: http://www.gnome.org/
 Source0: gnome-terminal-%{version}.tar.bz2
 # po/LINGUAS disaster
 Source1: po.tar.gz
 Patch0: gnome-terminal-2.12.0-inputmethod.patch
 Patch1: gnome-terminal-2.14.1-real-transparency.patch
+# Fix gnome.org Bug 338913 – Terminal resized when switching tabs
+Patch2: gnome-terminal-2.15.0-338913-revert-336325.patch
 License: GPL 
 Group: User Interface/Desktops
 
@@ -58,6 +60,7 @@ GNOME terminal emulator application.
 tar xzf %{SOURCE1}
 %patch0 -p1 -b .inputmethod
 %patch1 -p0 -b .real-transparency
+%patch2 -p1 -b .338913-revert-336325
 
 %build
 
@@ -123,6 +126,9 @@ scrollkeeper-update -q
 %{_libdir}/bonobo
 
 %changelog
+* Thu May 18 2006 Dan Williams <dcbw@redhat.com> - 2.15.0-2
+- Revert gnome.org #336325 (fixes #338913 – Terminal resized when switching tabs)
+
 * Tue May 16 2006 Matthias Clasen <mclasen@redhat.com> 2.15.0-1
 - Update to 2.15.0