[Monodevelop-patches-list] r2125 - in trunk/MonoDevelop/Core/src: AddIns/BackendBindings/CSharpBinding MonoDevelop.Gui.Utils MonoDevelop.Gui.Utils/FileIcons

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

Author: tberman
Date: 2005-01-12 19:12:05 -0500 (Wed, 12 Jan 2005)
New Revision: 2125

Modified:
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Makefile.am
   trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/ChangeLog
   trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/FileIcons/FileIconLoader.cs
Log:
2005-01-12  Todd Berman  <tberman at off.net>

        * FileIcons/FileIconLoader.cs: Workaround weird return values.
        Patch from Mart <mart at karu15.ee>



Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Makefile.am	2005-01-12 01:31:03 UTC (rev 2124)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Makefile.am	2005-01-13 00:12:05 UTC (rev 2125)
@@ -74,7 +74,7 @@
 $(filter %.xft.xml, $(build_TEMPLATES)): $(TEMPLATES_DIR)/%.xft.xml: $(srcdir)/templates/%.xft.xml
 	mkdir -p $(TEMPLATES_DIR)
 	cp $(srcdir)/templates/$(notdir $@) $@
-				
+
 $(ADDIN_BUILD)/$(ADDIN): $(srcdir)/$(ADDIN)
 	mkdir -p $(ADDIN_BUILD)
 	cp $(srcdir)/$(ADDIN) $(ADDIN_BUILD)/$(ADDIN)

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/ChangeLog	2005-01-12 01:31:03 UTC (rev 2124)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/ChangeLog	2005-01-13 00:12:05 UTC (rev 2125)
@@ -1,3 +1,8 @@
+2005-01-12  Todd Berman  <tberman at off.net>
+	
+	* FileIcons/FileIconLoader.cs: Workaround weird return values.
+	Patch from Mart <mart at karu15.ee>
+
 2004-12-26  John Luke  <john.luke at gmail.com>
 
 	* Glue.cs: remove IsGtk24 which was never used, and is

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/FileIcons/FileIconLoader.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/FileIcons/FileIconLoader.cs	2005-01-12 01:31:03 UTC (rev 2124)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/FileIcons/FileIconLoader.cs	2005-01-13 00:12:05 UTC (rev 2125)
@@ -44,20 +44,21 @@
 		{
 			Gdk.Pixbuf bf = (Gdk.Pixbuf) iconHash [type];
 			if (bf == null) {
-				int i;
-				string p_filename = "gnome-fs-regular";
+				const string default_icon_location = "../data/resources/icons/gnome-fs-regular.png";
+				string p_filename = "";
 				try {
+					int i;
 					p_filename = iconTheme.LookupIcon (type, 24, new Gnome.IconData (), out i);
-					if (p_filename == "") {
-						return new Gdk.Pixbuf ("../data/resources/icons/gnome-fs-regular.png");
+					if (p_filename.Equals ("")) {
+						p_filename = default_icon_location;
 					}
 				} catch {
-					return new Gdk.Pixbuf ("../data/resources/icons/gnome-fs-regular.png");
+					p_filename = default_icon_location;
 				}
 				try {
 					bf = new Gdk.Pixbuf (p_filename);
 				} catch {
-					bf = new Gdk.Pixbuf ("../data/resources/icons/gnome-fs-regular.png");
+					bf = new Gdk.Pixbuf (default_icon_location);
 				}
 				iconHash [type] = bf;
 			}