From 77acf827de09e8b2b1ab943003eb62921fd3e8ce Mon Sep 17 00:00:00 2001 From: Thomas Meire Date: Mon, 14 Jan 2008 18:04:13 +0100 Subject: [PATCH] reverted all changes related to the pwd (not ready for trunk yet) --- terminator | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/terminator b/terminator index 6141dab1..61904ef0 100755 --- a/terminator +++ b/terminator @@ -92,7 +92,7 @@ class TerminatorTerm: matches = {} - def __init__ (self, term, profile, pwd=None): + def __init__ (self, term, profile): self.defaults['profile_dir'] = self.defaults['_profile_dir']%(self.defaults['gt_dir']) self.defaults['link_user'] = self.defaults['_link_user']%(self.defaults['link_userchars'], self.defaults['link_passchars']) @@ -161,9 +161,9 @@ class TerminatorTerm: self.matches['path'] = self._vte.match_add ('((%s://(%s@)?)|(www|ftp)[%s]*\\.)[%s.]+(:[0-9]+)?/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%%]*[^]\'.}>) \t\r\n,\\\]'%(self.defaults['link_scheme'], self.defaults['link_userchars'], self.defaults['link_hostchars'], self.defaults['link_hostchars'])) self.matches['email'] = self._vte.match_add ('(mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+') - self.spawn_child (pwd) + self.spawn_child () - def spawn_child (self, dir=None, event=None): + def spawn_child (self, event=None): update_records = self.gconf_client.get_bool (self.profile + "/update_records") or True login = self.gconf_client.get_bool (self.profile + "/login_shell") or False @@ -173,8 +173,6 @@ class TerminatorTerm: else: shell = pwd.getpwuid (os.getuid ())[6] args = [os.path.basename (shell)] - if dir: - args.append(dir) self._vte.fork_command (command = shell, argv = args, envv = [], loglastlog = login, logwtmp = update_records, logutmp = update_records)