Merge mterrys changes to the PATH mangling for gdmflexiserver

[sojka/lightdm.git] / src / display.c

diff --git a/src/display.c b/src/display.c
index 0c30a6ee020eb5573a980ad61aea258dc1f36a32..a82a971479754304f4f8f6aeaae1247856e761aa 100644 (file)
--- a/src/display.c
+++ b/src/display.c
@@ -536,7 +536,6 @@ static Session *
 create_session (Display *display, PAMSession *authentication, const gchar *session_name, gboolean is_greeter, const gchar *log_filename)
 {
     gchar *sessions_dir, *filename, *path, *command = NULL;
-    const gchar *orig_path;
     GKeyFile *session_desktop_file;
     Session *session;
     gchar *cookie;
@@ -600,18 +599,6 @@ create_session (Display *display, PAMSession *authentication, const gchar *sessi
     process_set_env (PROCESS (session), "DESKTOP_SESSION", session_name); // FIXME: Apparently deprecated?
     process_set_env (PROCESS (session), "GDMSESSION", session_name); // FIXME: Not cross-desktop
 
-    /* Insert our own utility directory to PATH
-     * This is to provide gdmflexiserver which provides backwards compatibility with GDM.
-     * This can be removed when this is no longer required.
-     */
-    orig_path = process_get_env (PROCESS (session), "PATH");
-    if (orig_path)
-    {
-        path = g_strdup_printf ("%s:%s", PKGLIBEXEC_DIR, orig_path);
-        process_set_env (PROCESS (session), "PATH", path);
-        g_free (path);
-    }
-
     process_set_log_file (PROCESS (session), log_filename);
 
     /* Open ConsoleKit session */