Fix up the warning message a bit. (folder_browser_factory): Make the

	* folder-browser-factory.c (development_warning): Fix up the
	warning message a bit.
	(folder_browser_factory): Make the warning bypassable.

svn path=/trunk/; revision=2425

2 files changed, 16 insertions, 9 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 448f3c327d..14c6e1598c 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2000-04-14  Dan Winship  <danw@helixcode.com>
+
+	* folder-browser-factory.c (development_warning): Fix up the
+	warning message a bit.
+	(folder_browser_factory): Make the warning bypassable.
+
 2000-04-12  Miguel de Icaza  <miguel@gnu.org>
 
 	* main.c (main): Call e_cursors_init.
diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c
index a6075f7858..57b452a286 100644
--- a/mail/folder-browser-factory.c
+++ b/mail/folder-browser-factory.c
@@ -75,16 +75,17 @@ development_warning ()
 
 	warning_dialog = gnome_dialog_new (
 		"Don't do that",
-		"I know what I'm doing,\nI want to crash my mail files",
+		"I know what I'm doing,\nI want to lose mail!",
 		"I'll try it later",
 		NULL);
 
 	label = gtk_label_new (
-		_("This is a development version of Evolution.\n "
-		  "Using the mail component on your mail files\n "
-		  "is extremely hazardous.\n"
-		  "Please backup all your mails before trying\n "
-		  "this program. \n     You have been warned\n"));
+		_("This is a development version of Evolution.\n"
+		  "Using the mail component on your mail files\n"
+		  "is extremely hazardous.\n\n"
+		  "Do not run this program on your real mail\n "
+		  "and do not give it access to your real mail server.\n\n"
+		  "You have been warned\n"));
 	gtk_widget_show (label);
 
 	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (warning_dialog)->vbox), 
@@ -139,7 +140,6 @@ random_cb (GtkWidget *button, gpointer user_data)
 	printf ("Yow! I am called back!\n");
 }
 
-
 static void
 control_activate (BonoboControl *control, BonoboUIHandler *uih)
 {
@@ -244,10 +244,11 @@ folder_browser_factory (BonoboGenericFactory *factory, void *closure)
 {
 	BonoboControl *control;
 	GtkWidget *folder_browser;
-	gint warning_result;
+	gint warning_result = 0;
 
 
-	warning_result = development_warning ();
+	if (!getenv ("EVOLVE_ME_HARDER"))
+		warning_result = development_warning ();
 	
 	if (warning_result) 
 		folder_browser = gtk_label_new ("This should be the mail component");