Merge lp:~voldyman/pantheon-terminal/opt-remember-tabs into lp:~elementary-apps/pantheon-terminal/trunk

[Akshay Shekher]

Makes restoring exited (by the shell) tabs optional with a save-exited-tabs dconf key.

made remembering of tabs for restore optional to prevent memory leak and to make ctrl-d usable again

[Cody Garver (codygarver)]

Wouldn't remember-tabs make it an easier to read key name?

[Akshay Shekher (voldyman)]

Remember-tabs key is already used for restoring tabs from the last session.

[lp:~voldyman/pantheon-terminal/opt-remember-tabs]

553. By Akshay Shekher on 2014-04-01

changed the dconf key name to avoid confusion

[David Gomes (davidgomes)]

review: Approve

=== modified file 'org.pantheon.terminal.gschema.xml'
--- org.pantheon.terminal.gschema.xml	2014-01-21 18:12:13 +0000
+++ org.pantheon.terminal.gschema.xml	2014-04-01 15:04:05 +0000
@@ -138,5 +138,10 @@
       <summary>Tab Behavior</summary>
       <description>Whether to always show tabs, hide tabs when there is only one tab and never show tabs.</description>
     </key>
+    <key name="save-exited-tabs" type="b">
+      <default>true</default>
+      <summary>Make tabs restorable</summary>
+      <description>When a tab is closed, keep it in memory to restore it later or not</description>
+    </key>
   </schema>
 </schemalist>

=== modified file 'src/PantheonTerminalWindow.vala'
--- src/PantheonTerminalWindow.vala	2014-03-01 02:19:09 +0000
+++ src/PantheonTerminalWindow.vala	2014-04-01 15:04:05 +0000
@@ -224,7 +224,7 @@
                     case Gdk.Key.@D:
                     case Gdk.Key.@d:
                         if ((e.state & Gdk.ModifierType.CONTROL_MASK) != 0) {
-                            if (!current_terminal.has_foreground_process ()) {
+                            if (!current_terminal.has_foreground_process () && settings.save_exited_tabs) {
                                 action_close_tab ();
 
                                 return true;
@@ -303,7 +303,7 @@
             }
 
             if (!t.child_has_exited) {
-                if (notebook.n_tabs >= 2) {
+                if (notebook.n_tabs >= 2 && settings.save_exited_tabs) {
                     make_restorable (tab);
                 } else {
                     t.kill_ps ();

=== modified file 'src/Settings.vala'
--- src/Settings.vala	2014-03-01 02:19:09 +0000
+++ src/Settings.vala	2014-04-01 15:04:05 +0000
@@ -63,6 +63,7 @@
         public string encoding { get; set; }
         public string font { get; set; }
         public bool allow_bold { get; set; }
+        public bool save_exited_tabs { get; set; }
         public Granite.Widgets.DynamicNotebook.TabBarBehavior tab_bar_behavior { get; set; }
 
         public Settings ()  {