Remove unnecessary use of GuiDispatch

Most of event subscriptions don't need to be wrapped with a GuiDispatch
generated delegate wrapper since the events are already dispatched in the
UI thread.

4 files changed, 6 insertions, 18 deletions

diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.NodeBuilders/PackageNodeBuilder.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.NodeBuilders/PackageNodeBuilder.cs
index f721dfc27e..07ee6b9f76 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.NodeBuilders/PackageNodeBuilder.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.NodeBuilders/PackageNodeBuilder.cs
@@ -39,13 +39,6 @@ namespace MonoDevelop.Deployment.NodeBuilders
 {
 	internal class PackageNodeBuilder: TypeNodeBuilder
 	{
-		EventHandler configsChanged;
-		
-		public PackageNodeBuilder ()
-		{
-			configsChanged = (EventHandler) DispatchService.GuiDispatch (new EventHandler (OnConfigurationsChanged));
-		}
-		
 		public override Type CommandHandlerType {
 			get { return typeof(PackageNodeCommandHandler); }
 		}
@@ -81,13 +74,13 @@ namespace MonoDevelop.Deployment.NodeBuilders
 		public override void OnNodeAdded (object dataObject)
 		{
 			Package package = dataObject as Package;
-			package.Changed += configsChanged;
+			package.Changed += OnConfigurationsChanged;
 		}
 		
 		public override void OnNodeRemoved (object dataObject)
 		{
 			Package package = dataObject as Package;
-			package.Changed -= configsChanged;
+			package.Changed -= OnConfigurationsChanged;
 		}
 		
 		public void OnConfigurationsChanged (object sender, EventArgs args)
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.NodeBuilders/PackagingProjectNodeBuilder.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.NodeBuilders/PackagingProjectNodeBuilder.cs
index 001fcccd4f..0102146c55 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.NodeBuilders/PackagingProjectNodeBuilder.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.NodeBuilders/PackagingProjectNodeBuilder.cs
@@ -38,13 +38,6 @@ namespace MonoDevelop.Deployment.NodeBuilders
 {
 	internal class PackagingProjectNodeBuilder: TypeNodeBuilder
 	{
-		EventHandler configsChanged;
-		
-		public PackagingProjectNodeBuilder ()
-		{
-			configsChanged = (EventHandler) DispatchService.GuiDispatch (new EventHandler (OnConfigurationsChanged));
-		}
-		
 		public override Type CommandHandlerType {
 			get { return typeof(PackagingProjectNodeCommandHandler); }
 		}
@@ -86,13 +79,13 @@ namespace MonoDevelop.Deployment.NodeBuilders
 		public override void OnNodeAdded (object dataObject)
 		{
 			PackagingProject project = dataObject as PackagingProject;
-			project.PackagesChanged += configsChanged;
+			project.PackagesChanged += OnConfigurationsChanged;
 		}
 		
 		public override void OnNodeRemoved (object dataObject)
 		{
 			PackagingProject project = dataObject as PackagingProject;
-			project.PackagesChanged -= configsChanged;
+			project.PackagesChanged -= OnConfigurationsChanged;
 		}
 		
 		public void OnConfigurationsChanged (object sender, EventArgs args)
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/Package.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/Package.cs
index 22362fda36..13911d12a6 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/Package.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/Package.cs
@@ -70,6 +70,7 @@ namespace MonoDevelop.Deployment
 		
 		void NotifyChanged ()
 		{
+			Runtime.AssertMainThread ();
 			if (Changed != null)
 				Changed (this, EventArgs.Empty);
 		}
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/PackagingProject.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/PackagingProject.cs
index a08d4d5d30..e04e44842f 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/PackagingProject.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment/PackagingProject.cs
@@ -67,6 +67,7 @@ namespace MonoDevelop.Deployment
 		
 		internal void NotifyPackagesChanged ()
 		{
+			AssertMainThread ();
 			if (PackagesChanged != null)
 				PackagesChanged (this, EventArgs.Empty);
 		}