[Monodevelop-patches-list] r1886 - in trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Utils: . FileIcons

[commit-watcher at mono-cvs.ximian.com]

Author: tberman
Date: 2004-07-02 17:13:35 -0400 (Fri, 02 Jul 2004)
New Revision: 1886

Modified:
   trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Utils/ChangeLog
   trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Utils/FileIcons/FileIconLoader.cs
Log:
fixy fixy


Modified: trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Utils/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Utils/ChangeLog	2004-07-02 19:52:58 UTC (rev 1885)
+++ trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Utils/ChangeLog	2004-07-02 21:13:35 UTC (rev 1886)
@@ -1,3 +1,8 @@
+2004-07-02  Todd Berman  <tberman at off.net>
+
+	* FileIcons/FileIconLoader.cs: add a try catch that makes sure the
+	pixbuf is loaded properly. If it isnt, return a basic pixbuf.
+
 2004-06-30  John Luke  <jluke at cfl.rr.com>
 
 	* Glue.cs: add IsGtk24 property for potential FileChooser hack

Modified: trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Utils/FileIcons/FileIconLoader.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Utils/FileIcons/FileIconLoader.cs	2004-07-02 19:52:58 UTC (rev 1885)
+++ trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Utils/FileIcons/FileIconLoader.cs	2004-07-02 21:13:35 UTC (rev 1886)
@@ -54,7 +54,11 @@
 				} catch {
 					return new Gdk.Pixbuf ("../data/resources/icons/gnome-fs-regular.png");
 				}
-				bf = new Gdk.Pixbuf (p_filename);
+				try {
+					bf = new Gdk.Pixbuf (p_filename);
+				} catch {
+					bf = new Gdk.Pixbuf ("../data/resources/icons/gnome-fs-regular.png");
+				}
 				iconHash [type] = bf;
 			}
 			return bf;