[This should fix #5407, application crash on re-opening.]

* e-shell.c (e_shell_construct): Call
`gtk_widget_hide_on_delete()' on the splash.

* e-splash.c (e_splash_add_icon): Don't check for destruction
here.
(e_splash_set_icon_highlight): Not even here.
(button_press_event): Use a GTK+ cast.

svn path=/trunk/; revision=11743

3 files changed, 17 insertions, 8 deletions

diff --git a/shell/ChangeLog b/shell/ChangeLog
index 3a25203c57..49221e7fa3 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,17 @@
 2001-08-07  Ettore Perazzoli  <ettore@ximian.com>
 
+	[This should fix #5407, application crash on re-opening.]
+
+	* e-shell.c (e_shell_construct): Call
+	`gtk_widget_hide_on_delete()' on the splash.
+
+	* e-splash.c (e_splash_add_icon): Don't check for destruction
+	here.
+	(e_splash_set_icon_highlight): Not even here.
+	(button_press_event): Use a GTK+ cast.
+
+2001-08-07  Ettore Perazzoli  <ettore@ximian.com>
+
 	* e-shortcuts-view-model.c (load_group_into_model): Get the icon
 	from the folder type registry.
 	(shortcuts_new_shortcut_cb): Likewise.
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 0d3043d302..2d2d11565b 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -889,6 +889,7 @@ e_shell_construct (EShell *shell,
 		splash = NULL;
 	} else {
 		splash = e_splash_new ();
+		gtk_widget_hide_on_delete (splash);
 		gtk_widget_show (splash);
 	}
 
diff --git a/shell/e-splash.c b/shell/e-splash.c
index 650d585344..ff544d14ab 100644
--- a/shell/e-splash.c
+++ b/shell/e-splash.c
@@ -266,8 +266,10 @@ init (ESplash *splash)
 static gboolean
 button_press_event (GtkWidget *widget, GdkEventButton *event, gpointer data)
 {
-	ESplash *splash = (ESplash *) data;
-	
+	ESplash *splash;
+
+	splash = E_SPLASH (data);
+
 	gtk_widget_hide (GTK_WIDGET (splash));
 	
 	return TRUE;
@@ -377,9 +379,6 @@ e_splash_add_icon (ESplash *splash,
 	g_return_val_if_fail (E_IS_SPLASH (splash), 0);
 	g_return_val_if_fail (icon_pixbuf != NULL, 0);
 
-	if (GTK_OBJECT_DESTROYED (splash))
-		return 0;
-	
 	priv = splash->priv;
 
 	icon = icon_new (splash, icon_pixbuf);
@@ -411,9 +410,6 @@ e_splash_set_icon_highlight  (ESplash *splash,
 	g_return_if_fail (splash != NULL);
 	g_return_if_fail (E_IS_SPLASH (splash));
 
-	if (GTK_OBJECT_DESTROYED (splash))
-		return;
-	
 	priv = splash->priv;
 
 	icon = (Icon *) g_list_nth_data (priv->icons, num);