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

[Colin Walters <walters src gnome org>]

commit 6e2ec7291e43e525e5bb8387837b61cc54176909
Author: Colin Walters <walters verbum org>
Date:   Thu Apr 29 10:30:58 2010 -0400

    [gnome-shell.in] Move running environment inheritance earlier
    
    We also want to use it for --eval, so that works over
    ssh logins too.

 src/gnome-shell.in |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/src/gnome-shell.in b/src/gnome-shell.in
index 60a970a..51ab4b7 100644
--- a/src/gnome-shell.in
+++ b/src/gnome-shell.in
@@ -356,6 +356,11 @@ function main() {
     subprocess.Popen(['gnome-open', extensionjs_path])
     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:
     import dbus
 
@@ -394,10 +399,6 @@ if options.verbose:
     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:
     # Record initial terminal state so we can reset it to that