Part of the fix for Debian #525718 (GNOME #571417).

Index: nautilus-2.26.2/Makefile.am
===================================================================
--- nautilus-2.26.2.orig/Makefile.am	2009-05-31 17:36:35.209666581 +0200
+++ nautilus-2.26.2/Makefile.am	2009-05-31 17:37:45.070166522 +0200
@@ -5,7 +5,6 @@ include $(top_srcdir)/Makefile.shared
 desktopdir       = $(datadir)/applications
 desktop_DATA     = $(desktop_in_files:.desktop.in=.desktop)
 desktop_in_files = 					\
-	nautilus.desktop.in				\
 	nautilus-home.desktop.in			\
 	nautilus-computer.desktop.in			\
 	nautilus-folder-handler.desktop.in		\
@@ -13,6 +12,10 @@ desktop_in_files = 					\
 	nautilus-browser.desktop.in                     \
 	nautilus-autorun-software.desktop.in
 
+autostartdir       = $(datadir)/gnome/autostart
+autostart_DATA     = $(autostart_in_files:.desktop.in=.desktop)
+autostart_in_files = nautilus.desktop.in
+
 SUBDIRS =			\
 	eel			\
 	libnautilus-extension	\
Index: nautilus-2.26.2/nautilus.desktop.in.in
===================================================================
--- nautilus-2.26.2.orig/nautilus.desktop.in.in	2009-05-31 17:36:35.237669649 +0200
+++ nautilus-2.26.2/nautilus.desktop.in.in	2009-05-31 17:37:45.070166522 +0200
@@ -6,13 +6,12 @@ Icon=system-file-manager
 Terminal=false
 Type=Application
 StartupNotify=true
-NoDisplay=true
 OnlyShowIn=GNOME;
+AutostartCondition=GNOME /apps/nautilus/preferences/show_desktop
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=nautilus
 X-GNOME-Bugzilla-Component=general
 X-GNOME-Bugzilla-Version=@VERSION@
 X-GNOME-Autostart-Phase=Desktop
 X-GNOME-Autostart-Notify=true
-X-GNOME-AutoRestart=true
 X-GNOME-Provides=filemanager
Index: nautilus-2.26.2/src/nautilus-main.c
===================================================================
--- nautilus-2.26.2.orig/src/nautilus-main.c	2009-05-31 17:36:37.185668213 +0200
+++ nautilus-2.26.2/src/nautilus-main.c	2009-05-31 17:38:19.237663432 +0200
@@ -391,8 +391,8 @@ main (int argc, char *argv[])
 	browser_window = FALSE;
 
 	g_set_prgname ("nautilus");
-	if (g_file_test (DATADIR "/applications/nautilus.desktop", G_FILE_TEST_EXISTS)) {
-		egg_set_desktop_file (DATADIR "/applications/nautilus.desktop");
+	if (g_file_test (DATADIR "/gnome/autostart/nautilus.desktop", G_FILE_TEST_EXISTS)) {
+		egg_set_desktop_file (DATADIR "/gnome/autostart/nautilus.desktop");
 	}
 
 	context = g_option_context_new (_("\n\nBrowse the file system with the file manager"));
