Dual solution for cwd based on comments 36 & 37 by Egmont Koblinger in LP#1030562

This commit is contained in:
Stephen Boddy 2015-07-13 16:30:27 +02:00
parent 43c134b5c5
commit d53b036642
1 changed files with 7 additions and 3 deletions

View File

@ -210,9 +210,13 @@ class Terminal(Gtk.VBox):
def get_cwd(self):
"""Return our cwd"""
# Disabled and reverted to revert to old style cwd detection as only returns None.
# return(GLib.filename_from_uri(self.vte.get_current_directory_uri())[0])
return(self.terminator.pid_cwd(self.pid))
vte_cwd = self.vte.get_current_directory_uri()
if vte_cwd:
# OSC7 pwd gives an answer
return(GLib.filename_from_uri(vte_cwd)[0])
else:
# Fall back to old gtk2 method
return(self.terminator.pid_cwd(self.pid))
def close(self):
"""Close ourselves"""