Merge lp:~niclasl/pantheon-terminal/fix-duplication into lp:~elementary-apps/pantheon-terminal/trunk

[David Gomes]

DynamicNotebook: Fixed duplication bug #1214143.

Fixed DynamicNotebook's duplication for Terminal.

[Cody Garver (codygarver)]

open terminal > cd some-directory > open new tab > cd some-other-directory > right click some-directory tab and duplicate it > observe some-other-directory tab is duplicated instead of some-directory

review: Needs Fixing

[Cody Garver (codygarver)]

Works as expected now.

review: Approve

[Akshay Shekher (voldyman)]

please fix line 22 of the fix
to
var t = (tab.page as Gtk.Grid).get_child_at (0, 0) as TerminalWidget;

[David Gomes (davidgomes)]

IIRC there's a variable called current_terminal, can't you use that instead of "(tab.page as Gtk.Grid).get_child_at (0, 0) as TerminalWidget"?

[Niclas Lockner (niclasl)]

That is what I did at first, but as Cody Garver pointed out above, the path of the current terminal is not necessarily the path of the clicked tab's terminal.

[David Gomes (davidgomes)]

Very interesting! I approve then.

review: Approve

[Akshay Shekher (voldyman)]

Good work.

review: Approve

=== modified file 'src/PantheonTerminalWindow.vala'
--- src/PantheonTerminalWindow.vala	2013-08-28 13:53:05 +0000
+++ src/PantheonTerminalWindow.vala	2013-09-04 16:53:16 +0000
@@ -158,8 +158,9 @@
 
             notebook.tab_switched.connect (on_switch_page);
             notebook.tab_moved.connect (on_tab_moved);
+            notebook.tab_duplicated.connect (on_tab_duplicated);
             notebook.allow_new_window = true;
-            notebook.allow_duplication = false;
+            notebook.allow_duplication = true;
             notebook.margin_top = 3;
             notebook.group_name = "pantheon-terminal";
 
@@ -171,7 +172,7 @@
             });
 
             notebook.tab_removed.connect ((tab) => {
-                var t = ((tab.page as Gtk.Grid).get_child_at (0, 0) as TerminalWidget);
+                var t = (tab.page as Gtk.Grid).get_child_at (0, 0) as TerminalWidget;
 
                 if (t.has_foreground_process ()) {
                     var d = new ForegroundProcessDialog ();
@@ -355,6 +356,11 @@
                 notebook.show_tabs = false;
             }
         }
+        
+        private void on_tab_duplicated (Granite.Widgets.Tab tab) {
+            var t = (tab.page as Gtk.Grid).get_child_at (0, 0) as TerminalWidget;
+            new_tab (t.get_shell_location ());
+        }
 
         private void update_context_menu () {
             clipboard.request_targets (update_context_menu_cb);