From 136cf86a7cbf3b0e20720d2a1ebe7521f617b7bb Mon Sep 17 00:00:00 2001 From: Not Zed Date: Wed, 2 Apr 2003 03:41:57 +0000 Subject: [#39467] 2003-04-02 Not Zed [#39467] * e-shell.c (e_shell_construct): Change the splash logic slightly, so that if we can't create the splash, we dont try and cast/use it. * e-splash.c (e_splash_new): dont use a g_return* for what could be a valid (tho incorrect) runtime condition. svn path=/trunk/; revision=20629 --- shell/e-splash.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'shell/e-splash.c') diff --git a/shell/e-splash.c b/shell/e-splash.c index a8a234fd75..a6bb79e98c 100644 --- a/shell/e-splash.c +++ b/shell/e-splash.c @@ -370,7 +370,11 @@ e_splash_new (void) GdkPixbuf *splash_image_pixbuf; splash_image_pixbuf = gdk_pixbuf_new_from_file (EVOLUTION_IMAGES "/splash.png", NULL); - g_return_val_if_fail (splash_image_pixbuf != NULL, NULL); + + if (splash_image_pixbuf == NULL) { + g_warning("Cannot find splash image: %s", EVOLUTION_IMAGES "/splash.png"); + return NULL; + } new = g_object_new (e_splash_get_type (), NULL); e_splash_construct (new, splash_image_pixbuf); -- cgit