[Monodevelop-patches-list] r1961 - in trunk/MonoDevelop/Core/src: AddIns/BackendBindings/CSharpBinding Libraries/MonoDevelop.Gui.Widgets Libraries/MonoDevelop.Gui.Widgets/FileBrowser Main/Base Main/Base/Gui/Components

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

Author: tberman
Date: 2004-09-25 10:51:15 -0400 (Sat, 25 Sep 2004)
New Revision: 1961

Modified:
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ChangeLog
   trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/ChangeLog
   trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/FileBrowser/FileBrowser.cs
   trunk/MonoDevelop/Core/src/Main/Base/ChangeLog
   trunk/MonoDevelop/Core/src/Main/Base/Gui/Components/SdMenuCheckBox.cs
Log:
couple patches. 1 from me, 2 from latexer.


Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs	2004-09-23 21:07:16 UTC (rev 1960)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs	2004-09-25 14:51:15 UTC (rev 1961)
@@ -540,8 +540,14 @@
 			//return fileUtilityService.GetDirectoryNameWithSeparator(System.Runtime.InteropServices.RuntimeEnvironment.GetRuntimeDirectory()) + 
 			//       "csc.exe";
 			string ret = fileUtilityService.GetDirectoryNameWithSeparator(System.Runtime.InteropServices.RuntimeEnvironment.GetRuntimeDirectory());
-			ret = ret.Substring(0, ret.Length - 4);
-			ret = ret + "bin/mcs";
+			// Interop between mono 1.0.x and mono 1.1.x
+			if (ret.IndexOf("mono/1.0") == -1) {
+				ret = ret.Substring(0, ret.Length - 4);
+				ret = ret + "bin/mcs";
+			} else {
+				ret = ret.Substring(0, ret.Length - 13);
+				ret = ret + "bin/mcs";
+			}
 			return ret;
 			
 		}

Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ChangeLog	2004-09-23 21:07:16 UTC (rev 1960)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ChangeLog	2004-09-25 14:51:15 UTC (rev 1961)
@@ -1,3 +1,8 @@
+2004-09-25  Peter Johanson <latexer at gentoo.org>
+
+	* CSharpBindingCompilerManager.cs: Hack to a hack to fix compilation
+	on 1.1.1 with the new corlib location.
+
 2004-09-20  Valters Svabe  <valters at inbox.lv>
 
 	* CSharpBindingExecutionManager.cs.in: Respect PauseConsoleOutput

Modified: trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/ChangeLog	2004-09-23 21:07:16 UTC (rev 1960)
+++ trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/ChangeLog	2004-09-25 14:51:15 UTC (rev 1961)
@@ -1,3 +1,9 @@
+2004-09-25  Todd Berman  <tberman at off.net>
+
+	* FileBrowser/FileBrowser.cs: Use a ArrayList instead of a Hashtable
+	as it was just dup'd info. And use a using () construct instead of
+	.Close.
+
 2004-09-19  Fernando Herrera  <fherrera at onirica.com>
 
 	* Tree/TreeView.cs: Double click expands node.

Modified: trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/FileBrowser/FileBrowser.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/FileBrowser/FileBrowser.cs	2004-09-23 21:07:16 UTC (rev 1960)
+++ trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Widgets/FileBrowser/FileBrowser.cs	2004-09-25 14:51:15 UTC (rev 1961)
@@ -46,7 +46,7 @@
 
 		private PerformingTask performingtask = PerformingTask.None;
 		private ArrayList files = new ArrayList ();
-		private Hashtable hiddenfolders = new Hashtable ();
+		private ArrayList hiddenfolders = new ArrayList ();
 
 		PropertyService PropertyService = (PropertyService) ServiceManager.GetService (typeof (PropertyService));
 
@@ -447,20 +447,17 @@
 
 			if (System.IO.File.Exists (CurrentDir + System.IO.Path.DirectorySeparatorChar + ".hidden"))
 			{
-				StreamReader stream =  new StreamReader (CurrentDir + System.IO.Path.DirectorySeparatorChar + ".hidden");
-				string foldertohide = stream.ReadLine ();
-
-				while (foldertohide != null)
-				{
-					hiddenfolders.Add (foldertohide, foldertohide);
-					foldertohide = stream.ReadLine ();
+				using (StreamReader stream =  new StreamReader (System.IO.Path.Combine (CurrentDir, ".hidden"))) {
+					string foldertohide;
+					while ((foldertohide = stream.ReadLine ()) != null) {
+						hiddenfolders.Add (foldertohide);
+						foldertohide = stream.ReadLine ();
+					}
 				}
-
-				stream.Close ();
 			}			
 		}
 
-		private Boolean NotHidden (string folder)
+		private bool NotHidden (string folder)
 		{
 			return !hiddenfolders.Contains (folder);
 		} 

Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/ChangeLog	2004-09-23 21:07:16 UTC (rev 1960)
+++ trunk/MonoDevelop/Core/src/Main/Base/ChangeLog	2004-09-25 14:51:15 UTC (rev 1961)
@@ -1,3 +1,8 @@
+2004-09-25  Peter Johanson  <latexer at gentoo.org>
+
+	* Gui/Components/SdMenuCheckBox.cs: Workaround released gtk# 1.0.2
+	interaction with 1.1.1.
+
 2004-08-10  Todd Berman  <tberman at off.net>
 
 	* Gui/Dialogs/CombineConfiguration/CombineStartupPanel.cs: fix left

Modified: trunk/MonoDevelop/Core/src/Main/Base/Gui/Components/SdMenuCheckBox.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Gui/Components/SdMenuCheckBox.cs	2004-09-23 21:07:16 UTC (rev 1960)
+++ trunk/MonoDevelop/Core/src/Main/Base/Gui/Components/SdMenuCheckBox.cs	2004-09-25 14:51:15 UTC (rev 1961)
@@ -48,7 +48,7 @@
 			Gtk.AccelLabel child = new Gtk.AccelLabel (label);
 			child.Xalign = 0;
 			child.UseUnderline = true;
-			Child = child;
+			((Gtk.Container)this).Child = child;
 			child.AccelWidget = this;
 		}