diff options
| author | Not Zed <NotZed@Ximian.com> | 2003-04-02 11:41:57 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2003-04-02 11:41:57 +0800 |
| commit | 136cf86a7cbf3b0e20720d2a1ebe7521f617b7bb (patch) | |
| tree | 2c76b17072876a58d1d7ab6b6601a611d680f503 /shell/e-splash.c | |
| parent | c8e1c20b8a6b5ba84785ef63fcb4c2f4224dd0bc (diff) | |
| download | gsoc2013-evolution-136cf86a7cbf3b0e20720d2a1ebe7521f617b7bb.tar.gz gsoc2013-evolution-136cf86a7cbf3b0e20720d2a1ebe7521f617b7bb.tar.zst gsoc2013-evolution-136cf86a7cbf3b0e20720d2a1ebe7521f617b7bb.zip | |
[#39467]
2003-04-02 Not Zed <NotZed@Ximian.com>
[#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
Diffstat (limited to 'shell/e-splash.c')
| -rw-r--r-- | shell/e-splash.c | 6 |
1 files changed, 5 insertions, 1 deletions
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); |