New project model changes.

svn path=/trunk/monodevelop/; revision=103657

2 files changed, 4 insertions, 4 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Codons/CombineOpenCondition.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Codons/CombineOpenCondition.cs
index 39adabe73d..8a1976cf16 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Codons/CombineOpenCondition.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Codons/CombineOpenCondition.cs
@@ -40,13 +40,13 @@ namespace MonoDevelop.Ide.Codons
 	{
 		public CombineOpenCondition ()
 		{
-			IdeApp.ProjectOperations.CombineClosed += delegate { NotifyChanged(); };
-			IdeApp.ProjectOperations.CombineOpened += delegate { NotifyChanged(); };
+			IdeApp.Workspace.FirstWorkspaceItemOpened += delegate { NotifyChanged(); };
+			IdeApp.Workspace.LastWorkspaceItemClosed += delegate { NotifyChanged(); };
 		}
 		
 		public override bool Evaluate (NodeElement condition)
 		{
-			return IdeApp.ProjectOperations.CurrentOpenCombine != null;
+			return IdeApp.Workspace.IsOpen;
 		}
 	}
 }
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Codons/ProjectOpenCondition.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Codons/ProjectOpenCondition.cs
index 2cce042666..2b7b0dc688 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Codons/ProjectOpenCondition.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Codons/ProjectOpenCondition.cs
@@ -51,7 +51,7 @@ namespace MonoDevelop.Ide.Codons
 			Project project = IdeApp.ProjectOperations.CurrentSelectedProject;
 			
 			if (project == null && IdeApp.ProjectOperations.CurrentOpenCombine != null) {
-				CombineEntryCollection projects = IdeApp.ProjectOperations.CurrentOpenCombine.GetAllProjects();
+				SolutionItemCollection projects = IdeApp.ProjectOperations.CurrentOpenCombine.GetAllProjects();
 				if (projects.Count > 0) {
 					project = (Project)projects[0];
 				}