reverted all changes related to the pwd (not ready for trunk yet)
This commit is contained in:
parent
cb87e86bf9
commit
77acf827de
@ -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)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user