Mercurial > pidgin
diff src/gtkutils.c @ 14144:92f5e6f3acfb
[gaim-migrate @ 16786]
More/better assertion fixes. Especially when starting Gaim with
an account that doesn't have the global buddy icon preference
set, or when trying to set an icon using a file that is not an image.
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Wed, 16 Aug 2006 07:19:41 +0000 |
| parents | 5f656a0a82b7 |
| children |
line wrap: on
line diff
--- a/src/gtkutils.c Wed Aug 16 07:02:26 2006 +0000 +++ b/src/gtkutils.c Wed Aug 16 07:19:41 2006 +0000 @@ -2453,7 +2453,7 @@ } #endif -char* +char * gaim_gtk_convert_buddy_icon(GaimPlugin *plugin, const char *path) { #if GTK_CHECK_VERSION(2,2,0) @@ -2518,6 +2518,8 @@ format = gdk_pixbuf_loader_get_format(loader); g_object_unref(G_OBJECT(loader)); #endif + if (format == NULL) + return NULL; pixbuf_formats = gdk_pixbuf_format_get_extensions(format); if (str_array_match(pixbuf_formats, prpl_formats) && /* This is an acceptable format AND */