[Monodevelop-patches-list] r937 - in trunk/MonoDevelop/src: AddIns/DisplayBindings/SourceEditor/Gui Libraries/MonoDevelop.Gui.Utils/FileIcons Main/Base/Internal/Project/Project

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

Author: tberman
Date: 2004-02-18 14:58:53 -0500 (Wed, 18 Feb 2004)
New Revision: 937

Modified:
   trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs
   trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Utils/FileIcons/FileIconLoader.cs
   trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/ConvertXml.cs
Log:
fix for 0.30.1, fix for bt inside lookup icon, fix for gtk# upgrade


Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs	2004-02-18 02:34:05 UTC (rev 936)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs	2004-02-18 19:58:53 UTC (rev 937)
@@ -48,7 +48,7 @@
 			if (!ShowLineMarkers)
 				return;
 
-			if (e.Event.window == GetWindow (Gtk.TextWindowType.Left) && e.Event.Button == 1) {
+			if (e.Event.Window == GetWindow (Gtk.TextWindowType.Left) && e.Event.Button == 1) {
 				int x, y;
 				WindowToBufferCoords (Gtk.TextWindowType.Left, (int)e.Event.X, (int)e.Event.Y, out x, out y);
 				TextIter line;

Modified: trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Utils/FileIcons/FileIconLoader.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Utils/FileIcons/FileIconLoader.cs	2004-02-18 02:34:05 UTC (rev 936)
+++ trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Utils/FileIcons/FileIconLoader.cs	2004-02-18 19:58:53 UTC (rev 937)
@@ -36,7 +36,12 @@
 			Gdk.Pixbuf bf = (Gdk.Pixbuf) iconHash [type];
 			if (bf == null) {
 				int i;
-				string p_filename = iconTheme.LookupIcon (type, 24, new Gnome.IconData (), out i);
+				string p_filename = "gnome-fs-regular";
+				try {
+					p_filename = iconTheme.LookupIcon (type, 24, new Gnome.IconData (), out i);
+				} catch {
+					return null;
+				}
 				bf = new Gdk.Pixbuf (p_filename);
 				iconHash [type] = bf;
 			}

Modified: trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/ConvertXml.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/ConvertXml.cs	2004-02-18 02:34:05 UTC (rev 936)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/ConvertXml.cs	2004-02-18 19:58:53 UTC (rev 937)
@@ -114,17 +114,17 @@
 			
 			XPathDocument inputData = new XPathDocument(oXML);
 			
-			return xslt.Transform(inputData, xsltArgList, new XmlSecureResolver(new XmlUrlResolver(), new PermissionSet(PermissionState.Unrestricted)));
+			return xslt.Transform(inputData, xsltArgList);
 		}
 		
 		public static XmlReader TransformXmlToXml(XmlReader oXML, XmlReader XSLReader, XsltArgumentList xsltArgList)
 		{
 			XslTransform xslt = new XslTransform();
-			xslt.Load(XSLReader, new XmlSecureResolver(new XmlUrlResolver(), new PermissionSet(PermissionState.Unrestricted)), null);
+			xslt.Load(XSLReader, new XmlUrlResolver());
 			
 			XPathDocument inputData = new XPathDocument(oXML);
 			
-			return xslt.Transform(inputData, xsltArgList, new XmlSecureResolver(new XmlUrlResolver(), new PermissionSet(PermissionState.Unrestricted)));
+			return xslt.Transform(inputData, xsltArgList );
 		}
 		
 		/// <summary>