Author: lluis
Date: 2006-10-17 13:57:46 -0400 (Tue, 17 Oct 2006)
New Revision: 66758
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectOperations.cs
Log:
2006-10-17 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* MonoDevelop.Ide.Gui/ProjectOperations.cs: Make sure combine events
are dispatched in the GUI thread.
Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog 2006-10-17
17:54:51 UTC (rev 66757)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog 2006-10-17
17:57:46 UTC (rev 66758)
@@ -1,3 +1,8 @@
+2006-10-17 Lluis Sanchez Gual <[EMAIL PROTECTED]>
+
+ * MonoDevelop.Ide.Gui/ProjectOperations.cs: Make sure combine events
+ are dispatched in the GUI thread.
+
2006-10-06 Andrés G. Aragoneses <[EMAIL PROTECTED]>
* MonoDevelop.Ide.Gui.Dialogs/ReplaceDialog.cs: Improved string.
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectOperations.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectOperations.cs
2006-10-17 17:54:51 UTC (rev 66757)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectOperations.cs
2006-10-17 17:57:46 UTC (rev 66758)
@@ -73,10 +73,26 @@
ICompilerResult lastResult = new DefaultCompilerResult ();
+ ProjectFileEventHandler fileAddedToProjectHandler;
+ ProjectFileEventHandler fileRemovedFromProjectHandler;
+ ProjectFileRenamedEventHandler fileRenamedInProjectHandler;
+ ProjectFileEventHandler fileChangedInProjectHandler;
+ ProjectFileEventHandler filePropertyChangedInProjectHandler;
+ ProjectReferenceEventHandler referenceAddedToProjectHandler;
+ ProjectReferenceEventHandler referenceRemovedFromProjectHandler;
+
internal ProjectOperations ()
{
- Services.FileService.FileRemoved += new
FileEventHandler(CheckFileRemove);
- Services.FileService.FileRenamed += new
FileEventHandler(CheckFileRename);
+ fileAddedToProjectHandler = (ProjectFileEventHandler)
Services.DispatchService.GuiDispatch (new ProjectFileEventHandler
(NotifyFileAddedToProject));
+ fileRemovedFromProjectHandler =
(ProjectFileEventHandler) Services.DispatchService.GuiDispatch (new
ProjectFileEventHandler (NotifyFileRemovedFromProject));
+ fileRenamedInProjectHandler =
(ProjectFileRenamedEventHandler) Services.DispatchService.GuiDispatch (new
ProjectFileRenamedEventHandler (NotifyFileRenamedInProject));
+ fileChangedInProjectHandler = (ProjectFileEventHandler)
Services.DispatchService.GuiDispatch (new ProjectFileEventHandler
(NotifyFileChangedInProject));
+ filePropertyChangedInProjectHandler =
(ProjectFileEventHandler) Services.DispatchService.GuiDispatch (new
ProjectFileEventHandler (NotifyFilePropertyChangedInProject));
+ referenceAddedToProjectHandler =
(ProjectReferenceEventHandler) Services.DispatchService.GuiDispatch (new
ProjectReferenceEventHandler (NotifyReferenceAddedToProject));
+ referenceRemovedFromProjectHandler =
(ProjectReferenceEventHandler) Services.DispatchService.GuiDispatch (new
ProjectReferenceEventHandler (NotifyReferenceRemovedFromProject));
+
+ Services.FileService.FileRemoved += (FileEventHandler)
Services.DispatchService.GuiDispatch (new FileEventHandler (CheckFileRemove));
+ Services.FileService.FileRenamed += (FileEventHandler)
Services.DispatchService.GuiDispatch (new FileEventHandler (CheckFileRename));
parserDatabase =
Services.ParserService.CreateParserDatabase ();
parserDatabase.TrackFileChanges = true;
@@ -288,15 +304,15 @@
openCombine = (Combine) entry;
IdeApp.Workbench.RecentOpen.AddLastProject
(filename, openCombine.Name);
+
+ openCombine.FileAddedToProject +=
fileAddedToProjectHandler;
+ openCombine.FileRemovedFromProject +=
fileRemovedFromProjectHandler;
+ openCombine.FileRenamedInProject +=
fileRenamedInProjectHandler;
+ openCombine.FileChangedInProject +=
fileChangedInProjectHandler;
+ openCombine.FilePropertyChangedInProject +=
filePropertyChangedInProjectHandler;
+ openCombine.ReferenceAddedToProject +=
referenceAddedToProjectHandler;
+ openCombine.ReferenceRemovedFromProject +=
referenceRemovedFromProjectHandler;
- openCombine.FileAddedToProject += new
ProjectFileEventHandler (NotifyFileAddedToProject);
- openCombine.FileRemovedFromProject += new
ProjectFileEventHandler (NotifyFileRemovedFromProject);
- openCombine.FileRenamedInProject += new
ProjectFileRenamedEventHandler (NotifyFileRenamedInProject);
- openCombine.FileChangedInProject += new
ProjectFileEventHandler (NotifyFileChangedInProject);
- openCombine.FilePropertyChangedInProject += new
ProjectFileEventHandler (NotifyFilePropertyChangedInProject);
- openCombine.ReferenceAddedToProject += new
ProjectReferenceEventHandler (NotifyReferenceAddedToProject);
- openCombine.ReferenceRemovedFromProject += new
ProjectReferenceEventHandler (NotifyReferenceRemovedFromProject);
-
SearchForNewFiles ();
parserDatabase.Load (openCombine);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
