Merge lp:~pearce/terminator/gtk3-new-tab-dir into lp:terminator/gtk3

[judgedreads]

I added a default directory for new tabs in case the vte method fails to get the cwd.

[Stephen Boddy (stephen-j-boddy)]

I didn't see this merge request before I fixed the issue myself. As far as I can see the get_current_directory_uri is completely broken (at least in Python). It only ever returns a None for me, causing tabs to fail, and splits to not inherit the primary terminals directory. I reverted to the trunk method, which while kind of ugly, at least works reliably. See http://bazaar.launchpad.net/~gnome-terminator/terminator/gtk3/revision/1538

Thanks for the contributions.

review: Disapprove

Unmerged revisions

1530. By judgedreads <email address hidden> on 2015-03-29

set a default directory for new tabs

=== modified file 'terminatorlib/terminal.py'
--- terminatorlib/terminal.py	2015-03-02 21:03:08 +0000
+++ terminatorlib/terminal.py	2015-03-29 18:52:00 +0000
@@ -27,6 +27,7 @@
 from signalman import Signalman
 import plugin
 from terminatorlib.layoutlauncher import LayoutLauncher
+import cwd
 
 # pylint: disable-msg=R0904
 class Terminal(Gtk.VBox):
@@ -190,7 +191,11 @@
 
     def get_cwd(self):
         """Return our cwd"""
-        return(GLib.filename_from_uri(self.vte.get_current_directory_uri())[0])
+        try:
+            return(GLib.filename_from_uri(self.vte.get_current_directory_uri())[0])
+        except TypeError:
+            # Sensible default if vte method fails
+            return cwd.get_default_cwd()
 
     def close(self):
         """Close ourselves"""