[nautilus/gnome-3-0] application: don't look at DESKTOP_AUTOSTART_ID anymore

[Cosimo Cecchi <cosimoc src gnome org>]

commit 9b61f6d3da753f644cc81917159595f79df4fde3
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon May 2 10:12:20 2011 -0400

    application: don't look at DESKTOP_AUTOSTART_ID anymore
    
    Now that we don't support being a session component anymore, it doesn't
    make sense to special case the session autostart. This also breaks
    opening new windows when nautilus is added to ~/.config/autostart, which
    is now the supported way of having desktop icons automatically, as we
    end up reading the env variable every time when parsing the command line
    (as the original process will always have that set) and refuse to show a
    window.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=649063

 src/nautilus-application.c |   15 ---------------
 1 files changed, 0 insertions(+), 15 deletions(-)
---
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index cf9fa79..8407ddf 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -905,8 +905,6 @@ nautilus_application_command_line (GApplication *app,
 	gboolean no_default_window = FALSE;
 	gboolean no_desktop = FALSE;
 	gboolean kill_shell = FALSE;
-	gboolean autostart_mode = FALSE;
-	const gchar *autostart_id;
 	gchar *geometry = NULL;
 	gchar **remaining = NULL;
 	const GOptionEntry options[] = {
@@ -941,11 +939,6 @@ nautilus_application_command_line (GApplication *app,
 
 	argv = g_application_command_line_get_arguments (command_line, &argc);
 
-	autostart_id = g_getenv ("DESKTOP_AUTOSTART_ID");
-	if (autostart_id != NULL && *autostart_id != '\0') {
-		autostart_mode = TRUE;
-        }
-
 	if (!g_option_context_parse (context, &argc, &argv, &error)) {
 		g_printerr ("Could not parse arguments: %s\n", error->message);
 		g_error_free (error);
@@ -1004,14 +997,6 @@ nautilus_application_command_line (GApplication *app,
 		goto out;
 	}
 
-	/* If in autostart mode (aka started by gnome-session), we need to ensure 
-         * nautilus starts with the correct options.
-         */
-	if (autostart_mode) {
-		no_default_window = TRUE;
-		no_desktop = FALSE;
-	}
-
 	DEBUG ("Parsing command line, no_default_window %d, quit %d, "
 	       "self checks %d, no_desktop %d",
 	       no_default_window, kill_shell, perform_self_check, no_desktop);