move the development_warning from mail to shell so you don't get the

nasty partially drawn shortcut bar at startup, and so you only have to
see it once, regardless of how many mail folders you have

svn path=/trunk/; revision=3129

4 files changed, 68 insertions, 69 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index b3b68a764f..b876d0e781 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,8 @@
 2000-05-18  Dan Winship  <danw@helixcode.com>
 
+	* folder-browser-factory.c (folder_browser_factory): Remove
+	development_warning (moved to shell)
+
 	* message-list.c (select_msg): Update for camel_folder_get_uids
 	(folder_changed, message_list_set_folder): Update for
 	camel_folder_get_summary
diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c
index 10696fd536..e46e51df52 100644
--- a/mail/folder-browser-factory.c
+++ b/mail/folder-browser-factory.c
@@ -69,65 +69,6 @@ folder_browser_control_add_service_repository_interface (BonoboControl *control,
 }
 
 
-static int
-development_warning ()
-{
-	gint result;
-	GtkWidget *label, *warning_dialog;
-
-	warning_dialog = gnome_dialog_new (
-		"Evolution 0.0",
-		GNOME_STOCK_BUTTON_OK,
-		NULL);
-
-	label = gtk_label_new (
-		_(
-		  "Hi.  Thanks for taking the time to download this preview release of\n"
-		  "the Evolution groupware suite.\n"
-		  "\n"
-		  "The Evolution team has worked hard to make Evolution as robust,\n"
-		  "extensible, pretty, fast and well-suited to heavy internet users as\n"
-		  "possible.  And we're very tired.  But we're not done -- not yet.\n"
-		  "\n"
-		  "As you explore Evolution, please understand that most of our work has\n"
-		  "been focused on the backend engine which drives the entire system and\n"
-		  "not on the user interface.  We are just cresting the hill now, though,\n"
-		  "and will be pouring most of our love and attention into the UI from\n"
-		  "here out.  But at least you know that you're not using demoware.\n"
-		  "\n"
-		  "So, time for the nerdy disclaimer.  Evolution will: crash, lose your\n"
-		  "mail, leave stray processes running, consume 100% CPU, race, lock,\n"
-		  "send HTML mail to random mailing lists, and embarass you in front of\n"
-		  "your friends and co-workers.  Use at your own risk.\n"
-		  "\n"
-		  "We hope that you enjoy the results of our hard work, and we eagerly\n"
-		  "await your contributions!\n"
-		  ));
-	gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
-	gtk_widget_show (label);
-
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (warning_dialog)->vbox), 
-			    label, TRUE, TRUE, 0);
-
-	label = gtk_label_new (
-		_(
-		  "Thanks\n"
-		  "The Evolution Team\n"
-		  ));
-	gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_RIGHT);
-	gtk_misc_set_alignment(GTK_MISC(label), 1, .5);
-	gtk_widget_show (label);
-
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (warning_dialog)->vbox), 
-			    label, TRUE, TRUE, 0);
-
-	result = gnome_dialog_run (GNOME_DIALOG (warning_dialog));
-	
-	gtk_object_destroy (GTK_OBJECT (warning_dialog));
-
-	return result;
-} 
-
 static void
 random_cb (GtkWidget *button, gpointer user_data)
 {
@@ -240,17 +181,8 @@ folder_browser_factory (BonoboGenericFactory *factory, void *closure)
 {
 	BonoboControl *control;
 	GtkWidget *folder_browser;
-	gint warning_result = 0;
-
-
-	if (!getenv ("EVOLVE_ME_HARDER"))
-		warning_result = development_warning ();
-	
-	if (warning_result) 
-		folder_browser = gtk_label_new ("This should be the mail component");
-	else
-		folder_browser = folder_browser_new ();
 
+	folder_browser = folder_browser_new ();
 	if (folder_browser == NULL)
 		return NULL;
 
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 107ff4941d..395510285b 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-18  Dan Winship  <danw@helixcode.com>
+
+	* main.c (new_view_idle_cb): add development_warning (moved from
+	mail component)
+
 2000-05-16  Ettore Perazzoli  <ettore@helixcode.com>
 
 	* e-storage-set-view.c: Get rid of the `ICON_WIDTH' and
diff --git a/shell/main.c b/shell/main.c
index 27c1fc8400..e8885ecfc9 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -83,6 +83,62 @@ init_corba (int *argc, char **argv)
 #endif /* USING_OAF */
 
 
+static void
+development_warning ()
+{
+	GtkWidget *label, *warning_dialog;
+
+	warning_dialog = gnome_dialog_new (
+		"Evolution 0.0",
+		GNOME_STOCK_BUTTON_OK,
+		NULL);
+
+	label = gtk_label_new (
+		_(
+		  "Hi.  Thanks for taking the time to download this preview release of\n"
+		  "the Evolution groupware suite.\n"
+		  "\n"
+		  "The Evolution team has worked hard to make Evolution as robust,\n"
+		  "extensible, pretty, fast and well-suited to heavy internet users as\n"
+		  "possible.  And we're very tired.  But we're not done -- not yet.\n"
+		  "\n"
+		  "As you explore Evolution, please understand that most of our work has\n"
+		  "been focused on the backend engine which drives the entire system and\n"
+		  "not on the user interface.  We are just cresting the hill now, though,\n"
+		  "and will be pouring most of our love and attention into the UI from\n"
+		  "here out.  But at least you know that you're not using demoware.\n"
+		  "\n"
+		  "So, time for the nerdy disclaimer.  Evolution will: crash, lose your\n"
+		  "mail, leave stray processes running, consume 100% CPU, race, lock,\n"
+		  "send HTML mail to random mailing lists, and embarass you in front of\n"
+		  "your friends and co-workers.  Use at your own risk.\n"
+		  "\n"
+		  "We hope that you enjoy the results of our hard work, and we eagerly\n"
+		  "await your contributions!\n"
+		  ));
+	gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
+	gtk_widget_show (label);
+
+	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (warning_dialog)->vbox), 
+			    label, TRUE, TRUE, 0);
+
+	label = gtk_label_new (
+		_(
+		  "Thanks\n"
+		  "The Evolution Team\n"
+		  ));
+	gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_RIGHT);
+	gtk_misc_set_alignment(GTK_MISC(label), 1, .5);
+	gtk_widget_show (label);
+
+	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (warning_dialog)->vbox), 
+			    label, TRUE, TRUE, 0);
+
+	gnome_dialog_run (GNOME_DIALOG (warning_dialog));
+	
+	gtk_object_destroy (GTK_OBJECT (warning_dialog));
+} 
+
 static gint
 new_view_idle_cb (gpointer data)
 {
@@ -91,6 +147,9 @@ new_view_idle_cb (gpointer data)
 	shell = E_SHELL (data);
 	e_shell_new_view (shell, STARTUP_URI);
 
+	if (!getenv ("EVOLVE_ME_HARDER"))
+		development_warning ();
+
 	return FALSE;
 }