nautilus r14061 - in trunk: . src

[awalton svn gnome org]

Author: awalton
Date: Thu Apr 10 20:40:56 2008
New Revision: 14061
URL: http://svn.gnome.org/viewvc/nautilus?rev=14061&view=rev

Log:
2008-04-10  A. Walton  <awalton svn gnome org>

	* src/Makefile.am:
	* src/nautilus-application.c: (nautilus_application_startup):
	* src/nautilus-application.h:
	* src/nautilus-first-time-druid.c:
	* src/nautilus-first-time-druid.h:
	* src/nautilus-main.c: (main):
	Remove the first-time-druid dead code (#520773).



Removed:
   trunk/src/nautilus-first-time-druid.c
   trunk/src/nautilus-first-time-druid.h
Modified:
   trunk/ChangeLog
   trunk/src/Makefile.am
   trunk/src/nautilus-application.c
   trunk/src/nautilus-application.h
   trunk/src/nautilus-main.c

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Thu Apr 10 20:40:56 2008
@@ -75,8 +75,6 @@
 	nautilus-emblem-sidebar.h		\
 	nautilus-file-management-properties.c	\
 	nautilus-file-management-properties.h	\
-	nautilus-first-time-druid.c		\
-	nautilus-first-time-druid.h		\
 	nautilus-history-sidebar.c		\
 	nautilus-history-sidebar.h		\
 	nautilus-image-properties-page.c	\

Modified: trunk/src/nautilus-application.c
==============================================================================
--- trunk/src/nautilus-application.c	(original)
+++ trunk/src/nautilus-application.c	Thu Apr 10 20:40:56 2008
@@ -48,7 +48,6 @@
 #include <fcntl.h>
 #include <string.h>
 #include "nautilus-desktop-window.h"
-#include "nautilus-first-time-druid.h"
 #include "nautilus-main.h"
 #include "nautilus-spatial-window.h"
 #include "nautilus-navigation-window.h"
@@ -540,7 +539,6 @@
 			      gboolean restart_shell,
 			      gboolean no_default_window,
 			      gboolean no_desktop,
-			      gboolean do_first_time_druid_check,
 			      gboolean browser_window,
 			      const char *startup_id,
 			      const char *geometry,

Modified: trunk/src/nautilus-application.h
==============================================================================
--- trunk/src/nautilus-application.h	(original)
+++ trunk/src/nautilus-application.h	Thu Apr 10 20:40:56 2008
@@ -72,7 +72,6 @@
 							     gboolean             restart_shell,
 							     gboolean             no_default_window,
 							     gboolean             no_desktop,
-							     gboolean             do_first_time_druid_check,
 							     gboolean             browser_window,
 							     const char          *startup_id,
 							     const char          *default_geometry,

Modified: trunk/src/nautilus-main.c
==============================================================================
--- trunk/src/nautilus-main.c	(original)
+++ trunk/src/nautilus-main.c	Thu Apr 10 20:40:56 2008
@@ -554,7 +554,6 @@
 		nautilus_application_startup
 			(application,
 			 kill_shell, restart_shell, no_default_window, no_desktop,
-			 !(kill_shell || restart_shell),
 			 browser_window,
 			 startup_id_copy,
 			 geometry,