isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[gnome-shell.in] Move running environment inheritance earlier

Browse Source 
We also want to use it for --eval, so that works over
ssh logins too.
This commit is contained in:
Colin Walters 2010-04-29 10:30:58 -04:00
parent b0ba40f812
commit 6e2ec7291e
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gnome-shell.in
View File

@ -356,6 +356,11 @@ function main() {
subprocess.Popen(['gnome-open', extensionjs_path]) subprocess.Popen(['gnome-open', extensionjs_path])
sys.exit(0) sys.exit(0)
# Handle ssh logins
if 'DISPLAY' not in os.environ:
running_env = get_running_session_environs()
os.environ.update(running_env)
if options.eval_file: if options.eval_file:
import dbus import dbus
@ -394,10 +399,6 @@ if options.verbose:
print "Starting shell" print "Starting shell"
# Handle ssh logins
if 'DISPLAY' not in os.environ:
running_env = get_running_session_environs()
os.environ.update(running_env)
if options.debug: if options.debug:
# Record initial terminal state so we can reset it to that # Record initial terminal state so we can reset it to that