diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2004-02-26 05:15:45 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2004-02-26 05:15:45 +0800 |
| commit | 7bc051c5495f7443220709149a999eeebb6640b1 (patch) | |
| tree | 7bc1b3e2ab707bce6c0052b0656c3856d8e64cba | |
| parent | b75230fcd89e0dc054e8744cbdc1d3fdbd1c3542 (diff) | |
| download | gsoc2013-evolution-7bc051c5495f7443220709149a999eeebb6640b1.tar.gz gsoc2013-evolution-7bc051c5495f7443220709149a999eeebb6640b1.tar.zst gsoc2013-evolution-7bc051c5495f7443220709149a999eeebb6640b1.zip | |
Protect against feeding gdk_pixbuf_new_from_file() a NULL path. Clears up
2004-02-25 Jeffrey Stedfast <fejj@ximian.com>
* e-gui-utils.c (e_icon_for_mime_type): Protect against feeding
gdk_pixbuf_new_from_file() a NULL path. Clears up some console
warning spewage.
svn path=/trunk/; revision=24874
| -rw-r--r-- | e-util/ChangeLog | 6 | ||||
| -rw-r--r-- | e-util/e-gui-utils.c | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 94b3f4a095..b4b75c01fc 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,9 @@ +2004-02-25 Jeffrey Stedfast <fejj@ximian.com> + + * e-gui-utils.c (e_icon_for_mime_type): Protect against feeding + gdk_pixbuf_new_from_file() a NULL path. Clears up some console + warning spewage. + 2004-02-19 Not Zed <NotZed@Ximian.com> * e-pilot-util.c: include string.h, fixes 64 bit crash. From diff --git a/e-util/e-gui-utils.c b/e-util/e-gui-utils.c index fc8e5921b2..9f80610063 100644 --- a/e-util/e-gui-utils.c +++ b/e-util/e-gui-utils.c @@ -163,7 +163,10 @@ e_icon_for_mime_type (const char *mime_type, int size_hint) } } #endif - + + if (icon_path == NULL) + return NULL; + pixbuf = gdk_pixbuf_new_from_file (icon_path, NULL); g_free (icon_path); return pixbuf; |