[evolution-patches] fix for bug #41513

[Jeffrey Stedfast <fejj ximian com>]

-- 
Jeffrey Stedfast
Evolution Hacker - Ximian, Inc.
fejj ximian com  - www.ximian.com

? 41513.patch
? composer.patch
? debug-printfs.patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/composer/ChangeLog,v
retrieving revision 1.533
diff -u -r1.533 ChangeLog
--- ChangeLog	24 Apr 2003 01:57:47 -0000	1.533
+++ ChangeLog	25 Apr 2003 21:49:46 -0000
@@ -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>
 
 	* e-msg-composer.c (map_default_cb): removed debug printfs.
Index: e-msg-composer-attachment-bar.c
===================================================================
RCS file: /cvs/gnome/evolution/composer/e-msg-composer-attachment-bar.c,v
retrieving revision 1.65
diff -u -r1.65 e-msg-composer-attachment-bar.c
--- e-msg-composer-attachment-bar.c	9 Apr 2003 19:30:21 -0000	1.65
+++ e-msg-composer-attachment-bar.c	25 Apr 2003 21:49:47 -0000
@@ -249,8 +249,13 @@
 		}
 	}
 	
-	if (!filename)
-		filename = gnome_pixmap_file ("gnome-unknown.png");
+	if (filename && (pixbuf = gdk_pixbuf_new_from_file (filename, NULL))) {
+		g_free (filename);
+		return pixbuf;
+	}
+	
+	g_free (filename);
+	filename = gnome_pixmap_file ("gnome-unknown.png");
 	
 	pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
 	g_free (filename);