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

Unref our copy, and then destroy.

Browse Source 
2001-01-13  Miguel de Icaza  <miguel@gnu.org>

	* e-shell.c (e_shell_construct): Unref our copy, and then destroy.

	* e-splash.c (e_splash_set_icon_highlight): Do not execute code if
	we have been destroyed.
	(e_splash_add_icon): ditto.

svn path=/trunk/; revision=7475
This commit is contained in:
Miguel de Icaza
2001-01-13 06:21:49 +00:00
committed by Miguel de Icaza
parent f88c5b4073
commit e4eaa198dd
3 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
shell/ChangeLog
View File

@ -1,3 +1,11 @@
2001-01-13 Miguel de Icaza <miguel@gnu.org>
* e-shell.c (e_shell_construct): Unref our copy, and then destroy.
* e-splash.c (e_splash_set_icon_highlight): Do not execute code if
we have been destroyed.
(e_splash_add_icon): ditto.
2001-01-12 Miguel de Icaza <miguel@gnu.org>
* e-splash.c (e_splash_construct): Ok, talked to Ettore. Going

4
shell/e-shell.c
View File

@ -710,6 +710,9 @@ e_shell_construct (EShell *shell,
} else {
splash = e_splash_new ();
gtk_widget_show (splash);
/* Keep our own reference */
gtk_object_ref (GTK_OBJECT (splash));
}
while (gtk_events_pending ())
@ -753,6 +756,7 @@ e_shell_construct (EShell *shell,
g_free (shortcut_path);
sleep (2);
gtk_widget_unref (splash);
gtk_widget_destroy (splash);
return TRUE;

7
shell/e-splash.c
View File

@ -321,6 +321,7 @@ e_splash_construct (ESplash *splash,
gtk_window_set_position (GTK_WINDOW (splash), GTK_WIN_POS_CENTER);
gtk_window_set_policy (GTK_WINDOW (splash), FALSE, FALSE, FALSE);
gtk_window_set_default_size (GTK_WINDOW (splash), image_width, image_height);
}
/**
@ -369,6 +370,9 @@ 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);
@ -400,6 +404,9 @@ 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 (priv->icons, num)->data;