rpms/mono/devel mono-2.0-mimeicon.patch, NONE, 1.1 import.log, 1.5, 1.6 mono.spec, 1.79, 1.80

[Paul F. Johnson]

Author: pfj

Update of /cvs/pkgs/rpms/mono/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22129/devel

Modified Files:
	import.log mono.spec 
Added Files:
	mono-2.0-mimeicon.patch 
Log Message:

Added mimeinfo backport fix 


mono-2.0-mimeicon.patch:

--- NEW FILE mono-2.0-mimeicon.patch ---
--- mono-2.0/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MimeIcon.cs	2008-09-02 16:46:50.000000000 +0100
+++ mono-2.0/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MimeIcon-new.cs	2008-09-18 23:29:05.000000000 +0100
@@ -358,11 +358,12 @@
 				if (internal_mime_type == "harddisk/harddisk" || internal_mime_type == "cdrom/cdrom" || internal_mime_type == "removable/removable")
 					image = ResourceImageLoader.Get ("text-x-generic.png");
 			}
-			
-			index = MimeIconEngine.SmallIcons.Images.Add (image, Color.Transparent);
-			MimeIconEngine.LargeIcons.Images.Add (image, Color.Transparent);
-			
-			MimeIconEngine.MimeIconIndex.Add (internal_mime_type, index);
+
+			if (image != null) {
+				index = MimeIconEngine.SmallIcons.Images.Add (image, Color.Transparent);
+				MimeIconEngine.LargeIcons.Images.Add (image, Color.Transparent);
+				MimeIconEngine.MimeIconIndex.Add (internal_mime_type, index);
+			}
 		}
 		
 		public override object AddAndGetIconIndex (string filename, string mime_type)
@@ -370,11 +371,11 @@
 			int index = -1;
 			
 			Image image = GnomeUtil.GetIcon (filename, mime_type, 48);
-			
-			index = MimeIconEngine.SmallIcons.Images.Add (image, Color.Transparent);
-			MimeIconEngine.LargeIcons.Images.Add (image, Color.Transparent);
-			
-			MimeIconEngine.MimeIconIndex.Add (mime_type, index);
+			if (image != null) {
+				index = MimeIconEngine.SmallIcons.Images.Add (image, Color.Transparent);
+				MimeIconEngine.LargeIcons.Images.Add (image, Color.Transparent);
+				MimeIconEngine.MimeIconIndex.Add (mime_type, index);
+			}
 			
 			return index;
 		}
@@ -384,11 +385,11 @@
 			int index = -1;
 			
 			Image image = GnomeUtil.GetIcon (mime_type, 48);
-			
-			index = MimeIconEngine.SmallIcons.Images.Add (image, Color.Transparent);
-			MimeIconEngine.LargeIcons.Images.Add (image, Color.Transparent);
-			
-			MimeIconEngine.MimeIconIndex.Add (mime_type, index);
+			if (image != null) {
+				index = MimeIconEngine.SmallIcons.Images.Add (image, Color.Transparent);
+				MimeIconEngine.LargeIcons.Images.Add (image, Color.Transparent);
+				MimeIconEngine.MimeIconIndex.Add (mime_type, index);
+			}
 			
 			return index;
 		}


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	17 Sep 2008 21:00:05 -0000	1.5
+++ import.log	19 Sep 2008 08:59:14 -0000	1.6
@@ -3,3 +3,4 @@
 mono-2_0-5_fc10:HEAD:mono-2.0-5.fc10.src.rpm:1220047677
 mono-2_0-6_fc10:HEAD:mono-2.0-6.fc10.src.rpm:1221073246
 mono-2_0-7_fc10:HEAD:mono-2.0-7.fc10.src.rpm:1221685120
+mono-2_0-8_fc10:HEAD:mono-2.0-8.fc10.src.rpm:1221814700


Index: mono.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono/devel/mono.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- mono.spec	17 Sep 2008 21:00:05 -0000	1.79
+++ mono.spec	19 Sep 2008 08:59:14 -0000	1.80
@@ -1,6 +1,6 @@
 Name:		mono
 Version:        2.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A .NET runtime environment
 
 Group:          Development/Languages
@@ -45,6 +45,7 @@
 Patch9:mono-2.0-monoservice.patch
 Patch10: mono-2.0-metadata-makefile.patch
 Patch11: mono-2.0-tablelayout.patch
+Patch12: mono-2.0-mimeicon.patch
 
 %description
 The Mono runtime implements a JIT engine for the ECMA CLI
@@ -261,6 +262,7 @@
 %patch9 -p1 -b .monoservice
 %patch10 -p1 -b .metadata
 %patch11 -p1 -b .tablelayout
+%patch12 -p1 -b .mimeicon
 autoreconf -f -i -s
 
 # Add undeclared Arg
@@ -615,6 +617,9 @@
 %gac_dll IBM.Data.DB2
 
 %changelog
+* Thu Sep 18 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-8
+- MimeIcon patch added
+
 * Wed Sep 17 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-7
 - TableLayoutSettings fix (bz 462005)