[Monodevelop-patches-list] r1556 - in trunk/MonoDevelop/src/Main/Base: . Gui/Dialogs Internal/Project/Project Services/ParserService

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

Author: tberman
Date: 2004-05-01 23:49:05 -0400 (Sat, 01 May 2004)
New Revision: 1556

Modified:
   trunk/MonoDevelop/src/Main/Base/ChangeLog
   trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/TreeViewOptions.cs
   trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/ProjectReference.cs
   trunk/MonoDevelop/src/Main/Base/Services/ParserService/AssemblyInformation.cs
Log:
some misc fixes, some of these are half fixes, am waiting on some mono changes


Modified: trunk/MonoDevelop/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-05-01 20:24:29 UTC (rev 1555)
+++ trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-05-02 03:49:05 UTC (rev 1556)
@@ -1,5 +1,10 @@
 2004-05-01  Todd Berman  <tberman at sevenl.net>
 
+	* Gui/Dialogs/TreeViewOptions.cs: notify main window that gui effecting
+	changes may have occured, update the menu.
+
+2004-05-01  Todd Berman  <tberman at sevenl.net>
+
 	* Gui/Pads/OpenTaskView.cs: Fix gtk+2.4 regression.
 	* Services/ParserService/DefaultParserService.cs: load assemblies
 	out of the GAC for indexing.

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/TreeViewOptions.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/TreeViewOptions.cs	2004-05-01 20:24:29 UTC (rev 1555)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Dialogs/TreeViewOptions.cs	2004-05-02 03:49:05 UTC (rev 1556)
@@ -58,6 +58,7 @@
 				if (!pane.ReceiveDialogMessage (DialogMessage.OK))
 					return;
 			}
+			WorkbenchSingleton.Workbench.UpdateMenu (null, null);
 			TreeViewOptionDialog.Hide ();
 		}
 	
@@ -178,6 +179,7 @@
 		
 		private void CancelEvent (object o, EventArgs args)
 		{
+			WorkbenchSingleton.Workbench.UpdateMenu (null, null);
 			TreeViewOptionDialog.Hide ();
 		}
 		

Modified: trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/ProjectReference.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/ProjectReference.cs	2004-05-01 20:24:29 UTC (rev 1555)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Project/Project/ProjectReference.cs	2004-05-02 03:49:05 UTC (rev 1556)
@@ -97,9 +97,9 @@
 					return reference;
 				
 				case ReferenceType.Gac: 
-					return GetPathToGACAssembly(this);
+					//return GetPathToGACAssembly(this);
 					// TODO: gac on linux
-					//return reference;
+					return reference;
 				case ReferenceType.Project:
 					IProjectService projectService = (IProjectService)MonoDevelop.Core.Services.ServiceManager.Services.GetService(typeof(IProjectService));
 					string projectOutputLocation   = projectService.GetOutputAssemblyName(reference);

Modified: trunk/MonoDevelop/src/Main/Base/Services/ParserService/AssemblyInformation.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/ParserService/AssemblyInformation.cs	2004-05-01 20:24:29 UTC (rev 1555)
+++ trunk/MonoDevelop/src/Main/Base/Services/ParserService/AssemblyInformation.cs	2004-05-02 03:49:05 UTC (rev 1556)
@@ -94,7 +94,17 @@
 			//FIXME: Re-enable this code when the mono bug goes away, 0.32
 			//hopefully
 			//System.Reflection.Assembly asm = nonLocking ? Assembly.Load(GetBytes(fileName)) : Assembly.LoadFrom(fileName);
-			System.Reflection.Assembly asm = Assembly.LoadFrom (fileName);
+			Assembly asm = null;
+			try {
+				asm = Assembly.LoadFrom (fileName);
+				if (asm == null)
+					Assembly.LoadWithPartialName (Path.GetFileNameWithoutExtension (fileName));
+			} catch {
+			}
+			if(asm == null) {
+				Console.WriteLine ("Unable to load {0}", fileName);
+				return;
+			}
 			foreach (Type type in asm.GetTypes()) {
 				if (!type.FullName.StartsWith("<") && !type.IsSpecialName && type.IsPublic) {
 					classes.Add(new ReflectionClass(type));