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

If we fail to load the icon that gnome_vfs_get_icon() gave us, the default

Browse Source 
2003-04-25  Jeffrey Stedfast  <fejj@ximian.com>

	* e-msg-composer-attachment-bar.c (pixbuf_for_mime_type): If we
	fail to load the icon that gnome_vfs_get_icon() gave us, the
	default back to gnome-unknown.png. This is the only POSSIBLE way
	for Anna to be getting a NULL pixbuf if she has gnome-unknown.png
	that I can see. Should fix bug #41513.

svn path=/trunk/; revision=20982
This commit is contained in:
Jeffrey Stedfast
2003-04-28 15:58:43 +00:00
committed by Jeffrey Stedfast
parent 89aadcbd29
commit d4876ac1ad
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
composer/ChangeLog
View File

@ -1,3 +1,11 @@
2003-04-25 Jeffrey Stedfast <fejj@ximian.com>
* e-msg-composer-attachment-bar.c (pixbuf_for_mime_type): If we
fail to load the icon that gnome_vfs_get_icon() gave us, the
default back to gnome-unknown.png. This is the only POSSIBLE way
for Anna to be getting a NULL pixbuf if she has gnome-unknown.png
that I can see. Should fix bug #41513.
2003-04-23 Not Zed <NotZed@Ximian.com> 2003-04-23 Not Zed <NotZed@Ximian.com>
* e-msg-composer.c (map_default_cb): removed debug printfs. * e-msg-composer.c (map_default_cb): removed debug printfs.

9
composer/e-msg-composer-attachment-bar.c
View File

@ -249,8 +249,13 @@ pixbuf_for_mime_type (const char *mime_type)
} }
} }
if (!filename) if (filename && (pixbuf = gdk_pixbuf_new_from_file (filename, NULL))) {
filename = gnome_pixmap_file ("gnome-unknown.png"); g_free (filename);
return pixbuf;
}
g_free (filename);
filename = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_PIXMAP, "gnome-unknown.png", TRUE, NULL);
pixbuf = gdk_pixbuf_new_from_file (filename, NULL); pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
g_free (filename); g_free (filename);