callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
This commit is contained in:
Ettore Perazzoli
2001-08-07 21:47:25 +00:00
parent a108f5f32d
commit 3bc73b6a38
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
shell/ChangeLog
View File

@ -1,3 +1,15 @@
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

1
shell/e-shell.c
View File

@ -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);
}

12
shell/e-splash.c
View File

@ -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);