diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2001-08-08 05:47:25 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2001-08-08 05:47:25 +0800 |
| commit | 3bc73b6a382f9ba80d68f9e7b9740bc34ce1d101 (patch) | |
| tree | faeef1f08c9edd959be8161ea81518161293fad3 /shell/e-splash.c | |
| parent | a108f5f32d88ccc40123b1098ac1c11fce07b452 (diff) | |
| download | gsoc2013-evolution-3bc73b6a382f9ba80d68f9e7b9740bc34ce1d101.tar gsoc2013-evolution-3bc73b6a382f9ba80d68f9e7b9740bc34ce1d101.tar.gz gsoc2013-evolution-3bc73b6a382f9ba80d68f9e7b9740bc34ce1d101.tar.bz2 gsoc2013-evolution-3bc73b6a382f9ba80d68f9e7b9740bc34ce1d101.tar.lz gsoc2013-evolution-3bc73b6a382f9ba80d68f9e7b9740bc34ce1d101.tar.xz gsoc2013-evolution-3bc73b6a382f9ba80d68f9e7b9740bc34ce1d101.tar.zst gsoc2013-evolution-3bc73b6a382f9ba80d68f9e7b9740bc34ce1d101.zip | |
[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
Diffstat (limited to 'shell/e-splash.c')
| -rw-r--r-- | shell/e-splash.c | 12 |
1 files changed, 4 insertions, 8 deletions
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); |