Merge lp:~voldyman/pantheon-terminal/fixed-917766 into lp:~elementary-apps/pantheon-terminal/trunk

[Akshay Shekher]

[Cody Garver (codygarver)]

Approve to make branch go away.

review: Approve

=== modified file 'org.elementary.pantheon-terminal.gschema.xml'
--- org.elementary.pantheon-terminal.gschema.xml	2012-08-11 02:59:46 +0000
+++ org.elementary.pantheon-terminal.gschema.xml	2012-08-15 13:23:20 +0000
@@ -22,6 +22,11 @@
       <summary>The saved state of the window.</summary>
       <description>The saved state of the window.</description>
     </key>
+    <key name="tabs" type="s">
+      <default>""</default>
+      <summary>List of tabs which were active when the window was closed</summary>
+      <description>List of tabs which were active when the window was closed</description>
+    </key>
   </schema>
 
   <schema path="/org/pantheon/pantheon-terminal/settings/" id="org.elementary.PantheonTerminal.Settings" gettext-domain="pantheon-terminal">

=== modified file 'src/PantheonTerminalWindow.vala'
--- src/PantheonTerminalWindow.vala	2012-08-11 02:59:46 +0000
+++ src/PantheonTerminalWindow.vala	2012-08-15 13:23:20 +0000
@@ -112,7 +112,7 @@
 
             term_font = FontDescription.from_string (get_term_font ());
 
-            new_tab ();
+            open_tabs ();
         }
 
         private void setup_ui () {
@@ -125,7 +125,7 @@
             notebook.allow_new_window = true;
 
             notebook.tab_added.connect ((tab) => {
-            	new_tab (tab);
+            	new_tab ("", tab);
             });
 
             notebook.tab_removed.connect ((tab) => {
@@ -240,6 +240,15 @@
                 PantheonTerminal.saved_state.window_width = width;
                 PantheonTerminal.saved_state.window_height = height;
             }
+
+            saved_state.tabs  = "";
+            string tab_loc;
+            foreach (var t in terminals) {
+                t = (TerminalWidget) t;
+                tab_loc = t.get_shell_location ();
+                if (tab_loc != "")
+                    saved_state.tabs += tab_loc + ",";
+            }
         }
 
         void on_switch_page (Granite.Widgets.Tab? old, Granite.Widgets.Tab new_tab) {
@@ -249,7 +258,18 @@
             new_tab.page.grab_focus ();
         }
 
-        private void new_tab (owned Granite.Widgets.Tab? tab=null) {
+        private void open_tabs () {
+            if (saved_state.tabs == "")
+                new_tab ();
+            else {
+                foreach (string loc in saved_state.tabs.split (",")) {
+                    if (loc != "")
+                        new_tab (loc);
+                }
+            }
+        }
+
+        private void new_tab (string location="", owned Granite.Widgets.Tab? tab=null) {
             /* Set up terminal */
             var t = new TerminalWidget (main_actions, ui, this);
             t.scrollback_lines = settings.scrollback_lines;
@@ -264,7 +284,10 @@
             t.hexpand = true;
 
             /* Set up the virtual terminal */
-            t.active_shell ();
+            if (location == "")
+                t.active_shell ();
+            else
+                t.active_shell (location);
 
             /* Set up actions releated to the terminal */
             main_actions.get_action ("Copy").set_sensitive (t.get_has_selection ());
@@ -349,14 +372,16 @@
         protected override bool delete_event (Gdk.EventAny event) {
             update_saved_state ();
             action_quit ();
+            string tabs = "";
 
             foreach (var t in terminals) {
-                if (((TerminalWidget)t).has_foreground_process ()) {
+                t = (TerminalWidget) t;
+                tabs += t.get_shell_location () + ",";
+                if (t.has_foreground_process ()) {
                     var d = new ForegroundProcessDialog.before_close ();
                     if (d.run () == 1) {
-                        ((TerminalWidget) t).kill_ps_and_fg ();
+                        t.kill_ps_and_fg ();
                         d.destroy ();
-                        return false;
                     } else {
                         d.destroy ();
                         return true;
@@ -364,6 +389,7 @@
                 }
             }
 
+            saved_state.tabs = tabs;
             return false;
         }
 
@@ -388,6 +414,7 @@
 
         void action_close_tab () {
             notebook.remove_tab (notebook.current);
+            terminals.remove (current_terminal);
         }
 
         void action_new_window () {

=== modified file 'src/Settings.vala'
--- src/Settings.vala	2012-08-11 02:59:46 +0000
+++ src/Settings.vala	2012-08-15 13:23:20 +0000
@@ -34,6 +34,7 @@
         public int window_width { get; set; }
         public int window_height { get; set; }
         public PantheonTerminalWindowState window_state { get; set; }
+        public string tabs { get; set; }
 
         public SavedState () {
             base ("org.elementary.PantheonTerminal.SavedState");

=== modified file 'src/TerminalWidget.vala'
--- src/TerminalWidget.vala	2012-08-04 17:42:18 +0000
+++ src/TerminalWidget.vala	2012-08-15 13:23:20 +0000
@@ -191,5 +191,16 @@
             return this.match_check(col, row, out tag);
 
         }
+
+        public string get_shell_location () {
+            int pid = (!) (this.child_pid);
+
+            try {
+                return GLib.FileUtils.read_link ("/proc/%d/cwd".printf(pid));
+            } catch(GLib.FileError error) {
+                warning ("An error occured while fetching the current dir of shell");
+            }
+            return "";
+        }
     }
 }