Merge lp:~davidgomes/pantheon-terminal/fix-1029460 into lp:~elementary-apps/pantheon-terminal/trunk

[David Gomes]

There's a property in dconf-editor called "follow-last-tab" (default is True). If it is true, then when a new tab is open, it will open on the same directory as the last currently active tab, fixing bug #1029460.

[Tom Beckmann (tombeckmann)]

review: Approve

=== modified file 'org.elementary.pantheon-terminal.gschema.xml'
--- org.elementary.pantheon-terminal.gschema.xml	2012-08-17 22:53:36 +0000
+++ org.elementary.pantheon-terminal.gschema.xml	2012-08-21 14:20:25 +0000
@@ -35,7 +35,7 @@
       <summary>Number of scrollback lines</summary>
       <description>The number of scrollback lines of the terminal.</description>
     </key>
-    <key name="follow-last-tabs" type="b">
+    <key name="follow-last-tab" type="b">
       <default>true</default>
       <summary>Open last active tab path on new tab.</summary>
       <description>Defines whether a new tab should have the path of the last active tab.</description>

=== modified file 'src/PantheonTerminal.vala'
--- src/PantheonTerminal.vala	2012-07-31 09:52:59 +0000
+++ src/PantheonTerminal.vala	2012-08-21 14:20:25 +0000
@@ -70,8 +70,12 @@
 
         protected override void activate () {
             if (app_shell_name != null) {
-                GLib.Process.spawn_command_line_async ("gksu chsh -s " + app_shell_name);
-                return;
+                try {
+                    GLib.Process.spawn_command_line_async ("gksu chsh -s " + app_shell_name);
+                    return;
+                } catch (Error e) {
+                    warning (e.message);
+                }
             }
 
             new_window ();

=== modified file 'src/PantheonTerminalWindow.vala'
--- src/PantheonTerminalWindow.vala	2012-08-15 13:20:50 +0000
+++ src/PantheonTerminalWindow.vala	2012-08-21 14:20:25 +0000
@@ -101,7 +101,10 @@
                 error ("Couldn't load the UI: %s", e.message);
             }
 
-            Gtk.AccelGroup accel_group = ui.get_accel_group();
+            Notify.init ("pantheon-terminal");
+            //new Notify.Notification ("Bye Process", "apt-get moo finished", "utilities-terminal").show ();
+
+            Gtk.AccelGroup accel_group = ui.get_accel_group ();
             add_accel_group (accel_group);
 
             ui.insert_action_group (main_actions, 0);
@@ -422,7 +425,10 @@
         }
 
         void action_new_tab () {
-            new_tab ();
+            if (settings.follow_last_tab)
+                new_tab (current_terminal.get_shell_location ());
+            else
+                new_tab ();
         }
 
         void action_about () {

=== modified file 'src/Settings.vala'
--- src/Settings.vala	2012-08-15 19:59:12 +0000
+++ src/Settings.vala	2012-08-21 14:20:25 +0000
@@ -44,7 +44,7 @@
     public class Settings : Granite.Services.Settings {
 
         public int scrollback_lines { get; set; }
-        public bool follow_last_tabs { get; set; }
+        public bool follow_last_tab { get; set; }
 
         public int opacity {get; set; }
         public string foreground { get; set; }

=== modified file 'src/TerminalWidget.vala'
--- src/TerminalWidget.vala	2012-08-15 19:35:31 +0000
+++ src/TerminalWidget.vala	2012-08-21 14:20:25 +0000
@@ -116,7 +116,6 @@
 
             /*Make Links Clickable */
             this.clickable("""(https?|ftps?)://\S+""");
-
         }
 
         void on_child_exited () { }