Merge lp:~jeremywootten/pantheon-files/stop-close-last-tab into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Ensure new tab is created if last tab is closed to fix bug #1320602.

This makes the behaviour of Ctrl-W and the associated menu item the same as clicking on the close button of a tab, i.e. if the tab is the last one open then a new tab is made showing the users home folder.

This branch makes the behaviour of Ctrl-W and the associated menu item the same as clicking on the close button of a tab, i.e. if the tab is the last one open then a new tab is made showing the users home folder.

[David Gomes (davidgomes)]

I'd rename real_remove_tab to actual_remove_tab, it's more symbolic. Other than that, the code is fine I'll just have to test it.

review: Needs Fixing

[David Gomes (davidgomes)]

I confirm it works.

[lp:~jeremywootten/pantheon-files/stop-close-last-tab]

1502. By Jeremy Wootten on 2014-05-18

Change real_remove_tab to actual_remove_tab

[Jeremy Wootten (jeremywootten)]

Function name changed as advised.

=== modified file 'src/View/Window.vala'
--- src/View/Window.vala	2014-05-13 21:10:32 +0000
+++ src/View/Window.vala	2014-05-18 16:10:16 +0000
@@ -370,7 +370,13 @@
         }
 
         public void remove_tab (ViewContainer view_container) {
-            var tab = tabs.get_tab_by_widget (view_container as Gtk.Widget);
+            actual_remove_tab (tabs.get_tab_by_widget (view_container as Gtk.Widget));
+        }
+
+        private void actual_remove_tab (Granite.Widgets.Tab tab) {
+            /* signal for restore_data to be set and a new tab to be created if this is last tab */
+            tabs.close_tab_requested (tab);
+            /* now close the tab */
             tab.close ();
         }
 
@@ -425,7 +431,7 @@
         }
 
         private void action_remove_tab (Gtk.Action action) {
-            tabs.remove_tab (tabs.current);
+            actual_remove_tab (tabs.current);
         }
 
         private void save_geometries () {