reviewed by: Michael Engber <engber@eazel.com>

2001-01-15  J Shane Culpepper  <pepper@eazel.com>

	reviewed by: Michael Engber <engber@eazel.com>

	* src/nautilus-application.c: (nautilus_application_startup):
	* src/nautilus-application.h:
	* src/nautilus-first-time-druid.c: (druid_finished):
	* src/nautilus-main.c: (main):

	Fix for bug #1555.  There is already an error dialog but there
	was an infinite loop problem hiding it.  If the first time druid
	failed to create .nautilus, etc it would just run over and over
	again.

4 files changed, 6 insertions, 9 deletions

diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index 466df1932..5ee38bc82 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -333,6 +333,7 @@ nautilus_application_startup (NautilusApplication *application,
 			      gboolean restart_shell,
 			      gboolean start_desktop,
 			      gboolean no_default_window,
+			      gboolean do_first_time_druid_check,
 			      const char *geometry,
 			      const char *urls[])
 {
@@ -350,7 +351,7 @@ nautilus_application_startup (NautilusApplication *application,
 	}
 
 	/* Run the first time startup druid if needed. */
-	if (need_to_show_first_time_druid ()) {
+	if (do_first_time_druid_check && need_to_show_first_time_druid ()) {
 		nautilus_first_time_druid_show (application, start_desktop, urls);
 		return;
 	}
diff --git a/src/nautilus-application.h b/src/nautilus-application.h
index fc0f1715c..0af5fe52c 100644
--- a/src/nautilus-application.h
+++ b/src/nautilus-application.h
@@ -59,6 +59,7 @@ void                 nautilus_application_startup       (NautilusApplication *ap
 							 gboolean	      restart_shell,
 							 gboolean             start_desktop,
 							 gboolean             no_default_window,
+							 gboolean             do_first_time_druid_check,
 							 const char          *default_geometry,
 							 const char          *urls[]);
 						 
diff --git a/src/nautilus-first-time-druid.c b/src/nautilus-first-time-druid.c
index c01388ff5..f05716b78 100644
--- a/src/nautilus-first-time-druid.c
+++ b/src/nautilus-first-time-druid.c
@@ -44,6 +44,7 @@
 #include <libnautilus-extensions/nautilus-radio-button-group.h>
 #include <libnautilus-extensions/nautilus-string.h>
 #include <libnautilus-extensions/nautilus-user-level-manager.h>
+#include <libnautilus-extensions/nautilus-stock-dialogs.h>
 #include <nautilus-main.h>
 #include <netdb.h>
 #include <string.h>
@@ -174,12 +175,6 @@ druid_finished (GtkWidget *druid_page)
 	
 	user_main_directory = nautilus_get_user_main_directory ();
 
-	/* FIXME bugzilla.eazel.com 1555:
-	 * Need to post a error dialog if the user's main directory was not created
-	 */
-	if (!g_file_exists (user_main_directory)) {
-		g_warning ("Need to post a error dialog since the user's main directory was not created");
-	}
 	g_free (user_main_directory);
 
 	/* write out the first time file to indicate that we've successfully traversed the druid */
@@ -221,7 +216,7 @@ druid_finished (GtkWidget *druid_page)
 	signup_uris[1] = NULL;
 	
 	nautilus_application_startup (save_application, FALSE, FALSE, save_manage_desktop, 
-				      FALSE, NULL, (signup_uris[0] != NULL) ? signup_uris : NULL);
+				      FALSE, FALSE, NULL, (signup_uris[0] != NULL) ? signup_uris : NULL);
 	
 	/* Destroy druid last because it may be the only thing keeping the main event loop alive. */
 	gtk_widget_destroy (gtk_widget_get_toplevel (druid_page));
diff --git a/src/nautilus-main.c b/src/nautilus-main.c
index 96cdb192d..fcb0c098f 100644
--- a/src/nautilus-main.c
+++ b/src/nautilus-main.c
@@ -251,7 +251,7 @@ main (int argc, char *argv[])
 		application = nautilus_application_new ();
 		nautilus_application_startup
 			(application,
-			 kill_shell, restart_shell, start_desktop, no_default_window, geometry,
+			 kill_shell, restart_shell, start_desktop, no_default_window, TRUE, geometry,
 			 args);
 		if (is_event_loop_needed ()) {
 			bonobo_main ();