Merge lp:~jtaylor/ubuntu/quantal/gnome-terminal/lp-1040885 into lp:ubuntu/quantal/gnome-terminal

[Julian Taylor]

see bug

[lp:~jtaylor/ubuntu/quantal/gnome-terminal/lp-1040885]

90. By Julian Taylor on 2013-10-02

remove extra newline in changelog

Unmerged revisions

90. By Julian Taylor on 2013-10-02

remove extra newline in changelog

89. By Julian Taylor on 2013-10-02

* debian/patches/00_git_fix_geometry_on_focusout.patch:
   - backport an upstream patch to not resize the geometry when having tabs
     on focus out (LP: #1040885)

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-25 11:06:37 +0000
+++ debian/changelog	2013-10-02 21:57:25 +0000
@@ -1,3 +1,11 @@
+gnome-terminal (3.6.0-0ubuntu1.1) quantal-proposed; urgency=low
+
+  * debian/patches/00_git_fix_geometry_on_focusout.patch:
+     - backport an upstream patch to not resize the geometry when having tabs
+       on focus out (LP: #1040885)
+
+ -- Julian Taylor <[e-mail]>  Wed, 02 Oct 2013 19:11:49 +0200
+
 gnome-terminal (3.6.0-0ubuntu1) quantal-proposed; urgency=low
 
   * New upstream release

=== added file 'debian/patches/00_git_fix_geometry_on_focusout.patch'
--- debian/patches/00_git_fix_geometry_on_focusout.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/00_git_fix_geometry_on_focusout.patch	2013-10-02 21:57:25 +0000
@@ -0,0 +1,22 @@
+From 611e93f2f8c0c18ed8d365ecb850258e8d5c9c12 Mon Sep 17 00:00:00 2001
+From: Christian Persch <[e-mail]>
+Date: Wed, 16 Jan 2013 21:52:03 +0000
+Subject: window: Use the geometry of the active screen
+
+When we get the restyle on focus-out, the screens call terminal_window_set_size()
+directly. This was causing the window to revert to a previous size, see bug
+https://bugzilla.gnome.org/show_bug.cgi?id=688959 .
+---
+--- a/src/terminal-window.c
++++ b/src/terminal-window.c
+@@ -2572,6 +2572,10 @@ terminal_window_set_size_force_grid (Ter
+   int grid_width;
+   int grid_height;
+ 
++  /* Only update the geometry from the active screen. */
++  if (window->priv->active_screen != screen)
++    return;
++
+   /* be sure our geometry is up-to-date */
+   terminal_window_update_geometry (window);
+ 

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-09-25 11:06:37 +0000
+++ debian/patches/series	2013-10-02 21:57:25 +0000
@@ -3,3 +3,4 @@
 03_add_keywords.desktop
 20_add_alt_screen_toggle_ui.patch
 50_add_unity_quicklist.patch
+00_git_fix_geometry_on_focusout.patch