Run the install operation in the GUI thread

Mono.Addins is not thread safe.

2 files changed, 10 insertions, 6 deletions

diff --git a/Mono.Addins.Gui/Mono.Addins.Gui/InstallDialog.cs b/Mono.Addins.Gui/Mono.Addins.Gui/InstallDialog.cs
index a48b6c0..6c87f17 100644
--- a/Mono.Addins.Gui/Mono.Addins.Gui/InstallDialog.cs
+++ b/Mono.Addins.Gui/Mono.Addins.Gui/InstallDialog.cs
@@ -217,11 +217,8 @@ namespace Mono.Addins.Gui
 				warnmessage = Catalog.GetString ("The uninstallation has completed with warnings.");
 			}
 			
-			Thread t = new Thread (oper);
-			t.Start ();
-			
 			installing = true;
-			installMonitor.WaitForCompleted ();
+			oper ();
 			installing = false;
 			
 			buttonCancel.Visible = false;
diff --git a/Mono.Addins.Gui/Mono.Addins.Gui/InstallMonitor.cs b/Mono.Addins.Gui/Mono.Addins.Gui/InstallMonitor.cs
index 38d7de1..60f5949 100644
--- a/Mono.Addins.Gui/Mono.Addins.Gui/InstallMonitor.cs
+++ b/Mono.Addins.Gui/Mono.Addins.Gui/InstallMonitor.cs
@@ -61,12 +61,14 @@ namespace Mono.Addins.Gui
 		{
 			if (progressLabel != null)
 				progressLabel.Markup = "<b>" + GLib.Markup.EscapeText (mainOperation) + "</b>\n" + GLib.Markup.EscapeText (msg);
+			RunPendingEvents ();
 		}
 		
 		public void SetProgress (double progress)
 		{
 			if (progressBar != null)
 				progressBar.Fraction = progress;
+			RunPendingEvents ();
 		}
 		
 		public void Log (string msg)
@@ -113,8 +115,7 @@ namespace Mono.Addins.Gui
 		public void WaitForCompleted ()
 		{
 			while (!done) {
-				while (Gtk.Application.EventsPending ())
-					Gtk.Application.RunIteration ();
+				RunPendingEvents ();
 				Thread.Sleep (50);
 			}
 		}
@@ -122,5 +123,11 @@ namespace Mono.Addins.Gui
 		public bool Success {
 			get { return errors.Count == 0; }
 		}
+		
+		void RunPendingEvents ()
+		{
+			while (Gtk.Application.EventsPending ())
+				Gtk.Application.RunIteration ();
+		}
 	}
 }