* src/addins/WelcomePage/WelcomePageView.cs:

* src/addins/NUnit/Services/NUnitService.cs:
* src/addins/MonoDevelop.Autotools/Commands.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide/MessageService.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs:
* src/addins/MonoDevelop.Autotools/TarballBuilderEditorWidget.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs:
* src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs:
* src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/GettextFeatureWidget.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/LinkCommandEntry.cs:
* src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs:
* src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs:
* src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs:
* src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ToolboxService.cs:
* src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs:
* src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs:
* src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Commands/Commands.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/CollectionEditor.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FlagsSelectorDialog.cs:
* src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DeployOperations.cs:
* src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs:
* src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitCommand.cs:
* src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs:
* src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/PublishCommand.cs:
* src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CheckoutCommand.cs:
* src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
* src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs:
* src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/DotDesktopViewWidget.cs:
* src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/SelectRepositoryDialog.cs:
* src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/UserPasswordDialog.cs:
* src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/SslServerTrustDialog.cs:
* src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/ClientCertificateDialog.cs:
* src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/ClientCertificatePasswordDialog.cs:
  More dialog placing.

* src/core/MonoDevelop.Ide/gtk-gui/objects.xml: Flush.

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

49 files changed, 165 insertions, 158 deletions

diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/ChangeLog b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/ChangeLog
index 146f309bce..495a2484ea 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/ChangeLog
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-22  Michael Hutchinson  <mhutchinson@novell.com>
+
+	* MonoDevelop.Deployment.Linux/DotDesktopViewWidget.cs: More
+	  dialog placing.
+
 2010-05-21  Michael Hutchinson  <mhutchinson@novell.com>
 
 	* gtk-gui/MonoDevelop.Deployment.Linux.DotDesktopViewWidget.cs:
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/DotDesktopViewWidget.cs b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/DotDesktopViewWidget.cs
index 8ad55e994a..af06d0756a 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/DotDesktopViewWidget.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/DotDesktopViewWidget.cs
@@ -226,8 +226,7 @@ namespace MonoDevelop.Deployment.Linux
 		protected virtual void OnButtonAddCategoriesClicked(object sender, System.EventArgs e)
 		{
 			MenuCategorySelectorDialog dlg = new MenuCategorySelectorDialog ();
-			dlg.TransientFor = IdeApp.Workbench.RootWindow;
-			if (dlg.Run () == (int) Gtk.ResponseType.Ok) {
+			if (MessageService.ShowCustomDialog (dlg) == (int) Gtk.ResponseType.Ok) {
 				foreach (string s in dlg.Selection)
 					entry.Categories.Add (s);
 				FillCategs ();
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/ChangeLog b/main/src/addins/Deployment/MonoDevelop.Deployment/ChangeLog
index efbd9f216e..fe5fc72bae 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/ChangeLog
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-22  Michael Hutchinson  <mhutchinson@novell.com>
+
+	* MonoDevelop.Deployment.Commands/Commands.cs:
+	* MonoDevelop.Deployment.Gui/DeployOperations.cs: More dialog
+	  placing.
+
 2010-04-26  Lluis Sanchez Gual  <lluis@novell.com>
 
 	* MonoDevelop.Deployment.Targets/CommandPackageBuilder.cs:
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Commands/Commands.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Commands/Commands.cs
index 04f1f3a300..9aa5f48354 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Commands/Commands.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Commands/Commands.cs
@@ -21,8 +21,7 @@ namespace MonoDevelop.Deployment
 			SolutionItem entry = IdeApp.ProjectOperations.CurrentSelectedSolutionItem;
 			DeployDialog dlg = new DeployDialog (entry, false);
 			try {
-				dlg.TransientFor = IdeApp.Workbench.RootWindow;
-				if (dlg.Run () == (int) Gtk.ResponseType.Ok) {
+				if (MessageService.ShowCustomDialog (dlg) == (int) Gtk.ResponseType.Ok) {
 					if (dlg.SaveToProject) {
 						Package p = new Package ();
 						p.Name = dlg.NewPackageName;
@@ -62,8 +61,7 @@ namespace MonoDevelop.Deployment
 			PackagingProject project = IdeApp.ProjectOperations.CurrentSelectedSolutionItem as PackagingProject;
 			DeployDialog dlg = new DeployDialog (project.ParentFolder, true);
 			try {
-				dlg.TransientFor = IdeApp.Workbench.RootWindow;
-				if (dlg.Run () == (int) Gtk.ResponseType.Ok) {
+				if (MessageService.ShowCustomDialog (dlg) == (int) Gtk.ResponseType.Ok) {
 					project.AddPackage (dlg.NewPackageName, dlg.PackageBuilder);
 					IdeApp.ProjectOperations.Save (project);
 				}
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DeployOperations.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DeployOperations.cs
index d380238c3b..d69ee5d679 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DeployOperations.cs
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DeployOperations.cs
@@ -13,7 +13,7 @@ namespace MonoDevelop.Deployment.Gui
 			using (IProgressMonitor mon = IdeApp.Workbench.ProgressMonitors.GetRunProgressMonitor ()) {
 				InstallDialog dlg = new InstallDialog (entry);
 				try {
-					if (dlg.Run () == (int) Gtk.ResponseType.Ok)
+					if (MessageService.ShowCustomDialog (dlg) == (int) Gtk.ResponseType.Ok)
 						DeployService.Install (mon, entry, dlg.Prefix, dlg.AppName, configuration);
 				} finally {
 					dlg.Destroy ();
@@ -59,7 +59,7 @@ namespace MonoDevelop.Deployment.Gui
 		{
 			EditPackageDialog dlg = new EditPackageDialog (package);
 			try {
-				if (dlg.Run () == (int) Gtk.ResponseType.Ok)
+				if (MessageService.ShowCustomDialog (dlg) == (int) Gtk.ResponseType.Ok)
 					IdeApp.ProjectOperations.Save (package.ParentProject);
 			} finally {
 				dlg.Destroy ();
diff --git a/main/src/addins/MonoDevelop.Autotools/ChangeLog b/main/src/addins/MonoDevelop.Autotools/ChangeLog
index dcefa235d4..78bed36d4b 100644
--- a/main/src/addins/MonoDevelop.Autotools/ChangeLog
+++ b/main/src/addins/MonoDevelop.Autotools/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-22  Michael Hutchinson  <mhutchinson@novell.com>
+
+	* Commands.cs:
+	* TarballBuilderEditorWidget.cs: More dialog placing.
+
 2010-03-24  Lluis Sanchez Gual  <lluis@novell.com>
 
 	* SimpleProjectMakefileHandler.cs: Removed unnecessary
diff --git a/main/src/addins/MonoDevelop.Autotools/Commands.cs b/main/src/addins/MonoDevelop.Autotools/Commands.cs
index 3c11221705..6dc0579cd7 100644
--- a/main/src/addins/MonoDevelop.Autotools/Commands.cs
+++ b/main/src/addins/MonoDevelop.Autotools/Commands.cs
@@ -74,7 +74,7 @@ namespace MonoDevelop.Autotools
 
 			GenerateMakefilesDialog dialog = new GenerateMakefilesDialog (solution);
 			try {
-				if (dialog.Run () != (int) Gtk.ResponseType.Ok)
+				if (MessageService.ShowCustomDialog (dialog) != (int) Gtk.ResponseType.Ok)
 					return;
 
 				SolutionDeployer deployer = new SolutionDeployer (dialog.GenerateAutotools);
diff --git a/main/src/addins/MonoDevelop.Autotools/TarballBuilderEditorWidget.cs b/main/src/addins/MonoDevelop.Autotools/TarballBuilderEditorWidget.cs
index 83bef3fe39..849954d888 100644
--- a/main/src/addins/MonoDevelop.Autotools/TarballBuilderEditorWidget.cs
+++ b/main/src/addins/MonoDevelop.Autotools/TarballBuilderEditorWidget.cs
@@ -81,10 +81,8 @@ namespace MonoDevelop.Autotools
 		protected virtual void OnAutofooPropertiesClicked (object sender, System.EventArgs e)
 		{
 			MakefileSwitchEditor editor = new MakefileSwitchEditor (target);
-			editor.TransientFor = this.Toplevel as Gtk.Window;
 			editor.ShowAll ();
-			editor.Run ();
-			editor.Destroy ();
+			MonoDevelop.Ide.MessageService.RunCustomDialog (editor, this.Toplevel as Gtk.Window);
 		}
 	}
 }
diff --git a/main/src/addins/MonoDevelop.Debugger/ChangeLog b/main/src/addins/MonoDevelop.Debugger/ChangeLog
index abf5629ba0..4c487a1bd9 100644
--- a/main/src/addins/MonoDevelop.Debugger/ChangeLog
+++ b/main/src/addins/MonoDevelop.Debugger/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-22  Michael Hutchinson  <mhutchinson@novell.com>
+
+	* MonoDevelop.Debugger/DebuggingService.cs: More dialog
+	  placing.
+
 2010-05-21  Michael Hutchinson  <mhutchinson@novell.com>
 
 	* MonoDevelop.Debugger/DebugCommands.cs: Clean up dialog
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs
index b47240a0ca..40f7a75f4c 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs
@@ -203,22 +203,16 @@ namespace MonoDevelop.Debugger
 		
 		public static bool ShowBreakpointProperties (Breakpoint bp, bool editNew)
 		{
-			BreakpointPropertiesDialog dlg = new BreakpointPropertiesDialog (bp, editNew);
-			try {
-				dlg.TransientFor = IdeApp.Workbench.RootWindow;
-				if (dlg.Run () == (int) Gtk.ResponseType.Ok) {
-					return true;
-				}
-			} finally {
-				dlg.Destroy ();
-			}
+			var dlg = new BreakpointPropertiesDialog (bp, editNew);
+			if (MessageService.RunCustomDialog (dlg) == (int) Gtk.ResponseType.Ok)
+				return true;
 			return false;
 		}
 		
 		public static void ShowAddTracepointDialog (string file, int line)
 		{
 			AddTracePointDialog dlg = new AddTracePointDialog ();
-			if (dlg.Run () == (int) Gtk.ResponseType.Ok && dlg.Text.Length > 0) {
+			if (MessageService.ShowCustomDialog (dlg) == (int) Gtk.ResponseType.Ok && dlg.Text.Length > 0) {
 				Breakpoint bp = new Breakpoint (file, line);
 				bp.HitAction = HitAction.PrintExpression;
 				bp.TraceExpression = dlg.Text;
@@ -282,8 +276,7 @@ namespace MonoDevelop.Debugger
 			ExpressionEvaluatorDialog dlg = new ExpressionEvaluatorDialog ();
 			if (expression != null)
 				dlg.Expression = expression;
-			dlg.Run ();
-			dlg.Destroy ();
+			MessageService.RunCustomDialog (dlg);
 		}
 		
 		public static void ShowExceptionCaughtDialog ()
@@ -297,9 +290,7 @@ namespace MonoDevelop.Debugger
 
 		public static void ShowExceptionsFilters ()
 		{
-			ExceptionsDialog dlg = new ExceptionsDialog ();
-			dlg.Run ();
-			dlg.Destroy ();
+			MessageService.RunCustomDialog (new ExceptionsDialog ());
 		}
 		
 		static void SetupSession ()
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/ChangeLog b/main/src/addins/MonoDevelop.DesignerSupport/ChangeLog
index 8c54e70fe2..7deb4476f0 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/ChangeLog
+++ b/main/src/addins/MonoDevelop.DesignerSupport/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-22  Michael Hutchinson  <mhutchinson@novell.com>
+
+	* MonoDevelop.DesignerSupport/ToolboxService.cs: More dialog
+	  placing.
+
 2010-05-21  Michael Hutchinson  <mhutchinson@novell.com>
 
 	* MonoDevelop.DesignerSupport.Toolbox/ComponentSelectorDialog.cs:
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ToolboxService.cs b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ToolboxService.cs
index 6843831584..b5a2135171 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ToolboxService.cs
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ToolboxService.cs
@@ -126,9 +126,8 @@ namespace MonoDevelop.DesignerSupport
 		{
 			ComponentSelectorDialog dlg = new ComponentSelectorDialog (currentConsumer);
 			try {
-				dlg.TransientFor = IdeApp.Workbench.RootWindow;
 				dlg.Fill ();
-				dlg.Run ();
+				MessageService.ShowCustomDialog (dlg);
 			}
 			finally {
 				dlg.Destroy ();
diff --git a/main/src/addins/MonoDevelop.Gettext/ChangeLog b/main/src/addins/MonoDevelop.Gettext/ChangeLog
index 85d91b0368..31d22351d2 100644
--- a/main/src/addins/MonoDevelop.Gettext/ChangeLog
+++ b/main/src/addins/MonoDevelop.Gettext/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-22  Michael Hutchinson  <mhutchinson@novell.com>
+
+	* MonoDevelop.Gettext/GettextFeatureWidget.cs:
+	* MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs:
+	  More dialog placing.
+
 2010-04-29  Mike Krüger  <mkrueger@novell.com>
 
 	* MonoDevelop.Gettext.Editor/CatalogEditorView.cs: ViewContent
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs
index b5f73984ec..66421c4bbb 100644
--- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs
+++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs
@@ -121,9 +121,7 @@ namespace MonoDevelop.Gettext.NodeBuilders
 				TranslationProject project = CurrentNode.DataItem as TranslationProject;
 				if (project == null)
 					return;
-				TranslationProjectOptionsDialog options = new TranslationProjectOptionsDialog (project);
-				options.TransientFor = IdeApp.Workbench.RootWindow;
-				options.Run ();
+				MessageService.RunCustomDialog (new TranslationProjectOptionsDialog (project));
 				IdeApp.Workspace.Save ();
 			}
 			
@@ -143,14 +141,7 @@ namespace MonoDevelop.Gettext.NodeBuilders
 				string monitorTitle = GettextCatalog.GetString ("Translator Output");
 				Translator.LanguageChooserDialog chooser = new Translator.LanguageChooserDialog ();
 				try {
-					int response = 0;
-					chooser.Response += delegate(object o, ResponseArgs args) {
-						response = (int)args.ResponseId;
-					};
-					chooser.TransientFor = IdeApp.Workbench.RootWindow;
-					chooser.Run ();
-					
-					if (response == (int)ResponseType.Ok) {
+					if (MessageService.ShowCustomDialog (chooser) == (int)ResponseType.Ok) {
 						string language = chooser.Language + (chooser.HasCountry ? "_" + chooser.Country : "");
 					
 						using (IProgressMonitor monitor = IdeApp.Workbench.ProgressMonitors.GetOutputProgressMonitor (monitorTitle, "md-package", true, true)) {
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/GettextFeatureWidget.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/GettextFeatureWidget.cs
index a611187454..36569aa4c5 100644
--- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/GettextFeatureWidget.cs
+++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/GettextFeatureWidget.cs
@@ -53,21 +53,15 @@ namespace MonoDevelop.Gettext
 			this.treeviewTranslations.HeadersVisible = false;
 			
 			this.buttonAdd.Clicked += delegate {
-				MonoDevelop.Gettext.Translator.LanguageChooserDialog chooser = new MonoDevelop.Gettext.Translator.LanguageChooserDialog ();
-
-				int response = 0;
-				chooser.Response += delegate(object o, Gtk.ResponseArgs args) {
-					response = (int)args.ResponseId;
-				};
-				chooser.TransientFor = IdeApp.Workbench.RootWindow;
-				chooser.Run ();
-				
-				if (response == (int)Gtk.ResponseType.Ok) {
-					string language = chooser.Language + (chooser.HasCountry ? "_" + chooser.Country : "");
-					store.AppendValues (chooser.LanguageLong, language);
+				var chooser = new MonoDevelop.Gettext.Translator.LanguageChooserDialog ();
+				try {
+					if (MessageService.ShowCustomDialog (chooser) == (int)Gtk.ResponseType.Ok) {
+						string language = chooser.Language + (chooser.HasCountry ? "_" + chooser.Country : "");
+						store.AppendValues (chooser.LanguageLong, language);
+					}
+				} finally {
+					chooser.Destroy ();
 				}
-				
-				chooser.Destroy ();
 			};
 			this.buttonRemove.Sensitive = false;
 			treeviewTranslations.Selection.Changed += delegate {
diff --git a/main/src/addins/MonoDevelop.GtkCore/ChangeLog b/main/src/addins/MonoDevelop.GtkCore/ChangeLog
index ed6a616231..954a734429 100644
--- a/main/src/addins/MonoDevelop.GtkCore/ChangeLog
+++ b/main/src/addins/MonoDevelop.GtkCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-05-22  Michael Hutchinson  <mhutchinson@novell.com>
+
+	* MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs:
+	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs:
+	* MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs:
+	* MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs:
+	  More dialog placing.
+
 2010-05-11  Lluis Sanchez Gual  <lluis@novell.com>
 
 	* MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs:
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs
index 04bd159640..f840065952 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs
@@ -106,8 +106,7 @@ namespace MonoDevelop.GtkCore.Dialogs
 		
 		public bool Run ()
 		{
-			dialog.TransientFor = IdeApp.Workbench.RootWindow;
-			return dialog.Run () == (int) ResponseType.Ok;
+			return MessageService.ShowCustomDialog (dialog) == (int) ResponseType.Ok;
 		}
 		
 		public bool CreateNew {
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs
index b0c8031ba5..ae23733dde 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs
@@ -68,8 +68,7 @@ namespace MonoDevelop.GtkCore.Dialogs
 		
 		public int Run ()
 		{
-			dialog.TransientFor = IdeApp.Workbench.RootWindow;
-			return dialog.Run ();
+			return MessageService.ShowCustomDialog (dialog);
 		}
 		
 		public bool DeleteFile {
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs
index 323a98ba19..367e897b44 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs
@@ -70,8 +70,7 @@ namespace MonoDevelop.GtkCore.Dialogs
 		
 		public bool Run ()
 		{
-			dialog.TransientFor = IdeApp.Workbench.RootWindow;
-			return dialog.Run () == (int) ResponseType.Ok;
+			return MessageService.ShowCustomDialog (dialog) == (int) ResponseType.Ok;
 		}
 		
 		public string SelectedClass {
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs
index 369192ca6f..1c6f3eb516 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs
@@ -406,17 +406,13 @@ namespace MonoDevelop.GtkCore.GuiBuilder
 		
 		public void ImportGladeFile ()
 		{
-			Gtk.FileChooserDialog dialog =
-				new Gtk.FileChooserDialog ("Open Glade File", null, Gtk.FileChooserAction.Open,
-						       Gtk.Stock.Cancel, Gtk.ResponseType.Cancel,
-						       Gtk.Stock.Open, Gtk.ResponseType.Ok);
-			dialog.TransientFor = IdeApp.Workbench.RootWindow;
-			int response = dialog.Run ();
-			if (response == (int)Gtk.ResponseType.Ok) {
-				SteticProject.ImportGlade (dialog.Filename);
+			var dlg = new MonoDevelop.Components.SelectFileDialog (GettextCatalog.GetString ("Open Glade File"));
+			dlg.AddFilter (GettextCatalog.GetString ("Glade files"), "*.glade");
+			dlg.AddAllFilesFilter ();
+			if (dlg.Run ()) {
+				SteticProject.ImportGlade (dlg.SelectedFile);
 				Save (true);
 			}
-			dialog.Destroy ();
 		}
 		
 		public GuiBuilderWindow GetWindowForClass (string className)
diff --git a/main/src/addins/MonoDevelop.Refactoring/ChangeLog b/main/src/addins/MonoDevelop.Refactoring/ChangeLog
index 74ba210807..dbfc0f02a6 100644
--- a/main/src/addins/MonoDevelop.Refactoring/ChangeLog
+++ b/main/src/addins/MonoDevelop.Refactoring/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-22  Michael Hutchinson  <mhutchinson@novell.com>
+
+	* MonoDevelop.Refactoring/RefactoryCommands.cs:
+	* MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs:
+	  More dialog placing.
+
 2010-05-21  Michael Hutchinson  <mhutchinson@novell.com>
 
 	* gtk-gui/MonoDevelop.Refactoring.EncapsulateFieldDialog.cs:
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs
index 1c3f4db2d4..4049147770 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.ExtractMethod/ExtractMethodRefactoring.cs
@@ -89,9 +89,7 @@ namespace MonoDevelop.Refactoring.ExtractMethod
 				MessageService.ShowError (GettextCatalog.GetString ("Invalid selection for method extraction."));
 				return;
 			}
-			ExtractMethodDialog dialog = new ExtractMethodDialog (options, this, param);
-			dialog.TransientFor = IdeApp.Workbench.RootWindow;
-			dialog.Run ();
+			MessageService.RunCustomDialog (new ExtractMethodDialog (options, this, param));
 		}
 		
 		public ExtractMethodParameters CreateParameters (RefactoringOptions options)
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs
index 63dd1c39ff..a8f8b340a9 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs
@@ -1051,9 +1051,7 @@ namespace MonoDevelop.Refactoring
 				editor.BeginAtomicUndo ();
 			
 			try {
-				OverridesImplementsDialog dialog = new OverridesImplementsDialog ((IType)item);
-				dialog.TransientFor = IdeApp.Workbench.RootWindow;
-				dialog.Run ();
+				MessageService.RunCustomDialog (new OverridesImplementsDialog ((IType)item));
 			} finally {
 				if (editor != null)
 					editor.EndAtomicUndo ();
diff --git a/main/src/addins/MonoDevelop.WebReferences/ChangeLog b/main/src/addins/MonoDevelop.WebReferences/ChangeLog
index ae6ae44def..a3a5140362 100644
--- a/main/src/addins/MonoDevelop.WebReferences/ChangeLog
+++ b/main/src/addins/MonoDevelop.WebReferences/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-22  Michael Hutchinson  <mhutchinson@novell.com>
+
+	* MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs:
+	* MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs:
+	  More dialog placing.
+
 2010-05-21  Michael Hutchinson  <mhutchinson@novell.com>
 
 	* Makefile.am: Flush.
diff --git a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs
index 26a1c4d52a..1453ab1eb3 100644
--- a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs
+++ b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Commands/WebReferenceCommandHandler.cs
@@ -37,12 +37,8 @@ namespace MonoDevelop.WebReferences.Commands
 			WebReferenceDialog dialog = new WebReferenceDialog (project);
 			dialog.NamespacePrefix = project.Name;
 			
-			int response = dialog.Run();
-			dialog.Destroy();
-			if (response == (int)Gtk.ResponseType.Ok)
-			{
-				try
-				{
+			if (MessageService.RunCustomDialog (dialog) == (int)Gtk.ResponseType.Ok) {
+				try {
 					dialog.SelectedService.GenerateFiles (project, dialog.Namespace, dialog.ReferenceName);
 					IdeApp.ProjectOperations.Save(project);
 				}
diff --git a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs
index 94015954f8..1c0c6622b2 100644
--- a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs
+++ b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences.Dialogs/WebReferenceDialog.cs
@@ -442,7 +442,7 @@ namespace MonoDevelop.WebReferences.Dialogs
 				dlg.Password = nc.Password;
 			}
 			try {
-				if (dlg.Run () == (int) ResponseType.Ok) {
+				if (MessageService.ShowCustomDialog (dlg) == (int) ResponseType.Ok) {
 					nc = new NetworkCredential (dlg.User, dlg.Password);
 					tempCredentials [uri.Host + uri.AbsolutePath] = nc;
 					tempCredentials [uri.Host] = nc;
diff --git a/main/src/addins/NUnit/ChangeLog b/main/src/addins/NUnit/ChangeLog
index 257d73ae08..506eecb6a9 100644
--- a/main/src/addins/NUnit/ChangeLog
+++ b/main/src/addins/NUnit/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-22  Michael Hutchinson  <mhutchinson@novell.com>
+
+	* Services/NUnitService.cs: More dialog placing.
+
 2010-05-21  Michael Hutchinson  <mhutchinson@novell.com>
 
 	* Gui/NUnitAssemblyGroupConfigurationNodeBuilder.cs: Clean up
diff --git a/main/src/addins/NUnit/Services/NUnitService.cs b/main/src/addins/NUnit/Services/NUnitService.cs
index 1ab8eb0994..e0d5bf3aed 100644
--- a/main/src/addins/NUnit/Services/NUnitService.cs
+++ b/main/src/addins/NUnit/Services/NUnitService.cs
@@ -252,9 +252,7 @@ namespace MonoDevelop.NUnit
 		{
 			Properties properties = new Properties ();
 			properties.Set ("UnitTest", test);
-			UnitTestOptionsDialog optionsDialog = new UnitTestOptionsDialog (IdeApp.Workbench.RootWindow, properties);
-			optionsDialog.TransientFor = IdeApp.Workbench.RootWindow;
-			optionsDialog.Run ();
+			MessageService.RunCustomDialog (new UnitTestOptionsDialog (IdeApp.Workbench.RootWindow, properties));
 		}
 		
 		void NotifyTestSuiteChanged ()
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/ChangeLog b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/ChangeLog
index ee7ff19511..aaa4d82e1f 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/ChangeLog
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/ChangeLog
@@ -1,3 +1,11 @@
+2010-05-22  Michael Hutchinson  <mhutchinson@novell.com>
+
+	* MonoDevelop.VersionControl.Subversion.Gui/UserPasswordDialog.cs:
+	* MonoDevelop.VersionControl.Subversion.Gui/SslServerTrustDialog.cs:
+	* MonoDevelop.VersionControl.Subversion.Gui/ClientCertificateDialog.cs:
+	* MonoDevelop.VersionControl.Subversion.Gui/ClientCertificatePasswordDialog.cs:
+	  More dialog placing.
+
 2010-05-10  Lluis Sanchez Gual  <lluis@novell.com>
 
 	* MonoDevelop.VersionControl.Subversion/SvnClient.cs:
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/ClientCertificateDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/ClientCertificateDialog.cs
index 6643bcb3d2..53c1585c74 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/ClientCertificateDialog.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/ClientCertificateDialog.cs
@@ -35,9 +35,8 @@ namespace MonoDevelop.VersionControl.Subversion.Gui
 			
 			EventHandler del = delegate {
 					ClientCertificateDialog dlg = new ClientCertificateDialog (realm, may_save);
-					dlg.TransientFor = IdeApp.Workbench.RootWindow;
 					try {
-						res = (dlg.Run () == (int) Gtk.ResponseType.Ok);
+						res = (MessageService.ShowCustomDialog (dlg) == (int) Gtk.ResponseType.Ok);
 						if (res) {
 							local_save = dlg.Save;
 							local_cert_file = dlg.File;
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/ClientCertificatePasswordDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/ClientCertificatePasswordDialog.cs
index 581531786d..b2d45e550e 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/ClientCertificatePasswordDialog.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/ClientCertificatePasswordDialog.cs
@@ -36,8 +36,7 @@ namespace MonoDevelop.VersionControl.Subversion.Gui
 			EventHandler del = delegate {
 					ClientCertificatePasswordDialog dlg = new ClientCertificatePasswordDialog (realm, may_save);
 					try {
-						dlg.TransientFor = IdeApp.Workbench.RootWindow;
-						res = (dlg.Run () == (int) Gtk.ResponseType.Ok);
+						res = (MessageService.ShowCustomDialog (dlg) == (int) Gtk.ResponseType.Ok);
 						if (res) {
 							local_save = dlg.Save;
 							local_password = dlg.Password;
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/SslServerTrustDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/SslServerTrustDialog.cs
index fd102c14fd..d1c2aec1ba 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/SslServerTrustDialog.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/SslServerTrustDialog.cs
@@ -62,8 +62,7 @@ namespace MonoDevelop.VersionControl.Subversion.Gui
 			EventHandler del = delegate {
 					try {
 						SslServerTrustDialog dlg = new SslServerTrustDialog (realm, failures, certInfo, may_save);
-						dlg.TransientFor = IdeApp.Workbench.RootWindow;
-						res = (dlg.Run () == (int) Gtk.ResponseType.Ok);
+						res = (MessageService.ShowCustomDialog (dlg) == (int) Gtk.ResponseType.Ok);
 						if (res) {
 							local_save = dlg.Save;
 							local_accepted_failures = dlg.AcceptedFailures;
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/UserPasswordDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/UserPasswordDialog.cs
index 4e09768479..14db36377e 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/UserPasswordDialog.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.Gui/UserPasswordDialog.cs
@@ -55,8 +55,7 @@ namespace MonoDevelop.VersionControl.Subversion.Gui
 			EventHandler del = delegate {
 					try {
 						UserPasswordDialog dlg = new UserPasswordDialog (user, realm, may_save, showPwd);
-						dlg.TransientFor = IdeApp.Workbench.RootWindow;
-						res = (dlg.Run () == (int) Gtk.ResponseType.Ok);
+						res = (MessageService.ShowCustomDialog (dlg) == (int) Gtk.ResponseType.Ok);
 						if (res) {
 							s = dlg.SavePassword ? 1 : 0;
 							pwd = dlg.Password;
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/ChangeLog b/main/src/addins/VersionControl/MonoDevelop.VersionControl/ChangeLog
index eba61db01b..9c454bf989 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/ChangeLog
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/ChangeLog
@@ -1,3 +1,11 @@
+2010-05-22  Michael Hutchinson  <mhutchinson@novell.com>
+
+	* MonoDevelop.VersionControl/CommitCommand.cs:
+	* MonoDevelop.VersionControl/PublishCommand.cs:
+	* MonoDevelop.VersionControl/CheckoutCommand.cs:
+	* MonoDevelop.VersionControl.Dialogs/SelectRepositoryDialog.cs:
+	  More dialog placing.
+
 2010-05-20  Lluis Sanchez Gual  <lluis@novell.com>
 
 	* MonoDevelop.VersionControl.Views/AnnotateView.cs: Show a
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/SelectRepositoryDialog.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/SelectRepositoryDialog.cs
index 5b58f94d3c..93df725d2a 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/SelectRepositoryDialog.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/SelectRepositoryDialog.cs
@@ -4,6 +4,7 @@ using System.Threading;
 using System.Collections;
 using MonoDevelop.Core;
 using Gtk;
+using MonoDevelop.Ide;
 
 namespace MonoDevelop.VersionControl.Dialogs
 {
@@ -148,8 +149,7 @@ namespace MonoDevelop.VersionControl.Dialogs
 		{
 			EditRepositoryDialog dlg = new EditRepositoryDialog (null);
 			try {
-				dlg.TransientFor = this;
-				if (dlg.Run () == (int) Gtk.ResponseType.Ok && dlg.Repository != null) {
+				if (MessageService.ShowCustomDialog (dlg) == (int) Gtk.ResponseType.Ok && dlg.Repository != null) {
 					VersionControlService.AddRepository (dlg.Repository);
 					VersionControlService.SaveConfiguration ();
 					LoadRepositories (dlg.Repository, Gtk.TreeIter.Zero);
@@ -177,9 +177,8 @@ namespace MonoDevelop.VersionControl.Dialogs
 			if (rep != null) {
 				Repository repCopy = rep.Clone ();
 				EditRepositoryDialog dlg = new EditRepositoryDialog (repCopy);
-				dlg.TransientFor = this;
 				try {
-					if (dlg.Run () != (int) Gtk.ResponseType.Ok) {
+					if (MessageService.ShowCustomDialog (dlg, this) != (int) Gtk.ResponseType.Ok) {
 						VersionControlService.ResetConfiguration ();
 						return;
 					}
@@ -311,19 +310,9 @@ namespace MonoDevelop.VersionControl.Dialogs
 
 		protected virtual void OnButtonBrowseClicked(object sender, System.EventArgs e)
 		{
-			FileChooserDialog dialog =
-				new FileChooserDialog (GettextCatalog.GetString ("Select target directory"), null, FileChooserAction.SelectFolder,
-						       Gtk.Stock.Cancel, Gtk.ResponseType.Cancel,
-						       Gtk.Stock.Open, Gtk.ResponseType.Ok);
-			dialog.TransientFor = this;
-			int response = dialog.Run ();
-			try {
-				if (response == (int)Gtk.ResponseType.Ok) {
-					entryFolder.Text = dialog.Filename;
-				}
-			} finally {
-				dialog.Destroy ();
-			}
+			var dlg = new MonoDevelop.Components.SelectFolderDialog (GettextCatalog.GetString ("Select target directory"));
+			if (dlg.Run ())
+				entryFolder.Text = dlg.SelectedFile;
 		}
 
 		protected virtual void OnNotebookChangeCurrentPage(object o, Gtk.ChangeCurrentPageArgs args)
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CheckoutCommand.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CheckoutCommand.cs
index b981a8059d..2cb3a1d902 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CheckoutCommand.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CheckoutCommand.cs
@@ -13,9 +13,8 @@ namespace MonoDevelop.VersionControl
 				return;
 			
 			SelectRepositoryDialog del = new SelectRepositoryDialog (SelectRepositoryMode.Checkout);
-			del.TransientFor = IdeApp.Workbench.RootWindow;
 			try {
-				if (del.Run () == (int) Gtk.ResponseType.Ok && del.Repository != null) {
+				if (MessageService.ShowCustomDialog (del) == (int) Gtk.ResponseType.Ok && del.Repository != null) {
 					CheckoutWorker w = new CheckoutWorker (del.Repository, del.TargetPath);
 					w.Start ();
 				}
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitCommand.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitCommand.cs
index 765568c7e0..1cafd4be3e 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitCommand.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitCommand.cs
@@ -45,9 +45,8 @@ namespace MonoDevelop.VersionControl
 					if (!VersionControlService.NotifyPrepareCommit (vc, changeSet))
 						return false;
 					CommitDialog dlg = new CommitDialog (changeSet);
-					dlg.TransientFor = IdeApp.Workbench.RootWindow;
 					try {
-						if (dlg.Run () == (int) Gtk.ResponseType.Ok) {
+						if (MessageService.ShowCustomDialog (dlg) == (int) Gtk.ResponseType.Ok) {
 							if (VersionControlService.NotifyBeforeCommit (vc, changeSet)) {
 								new CommitWorker (vc, changeSet, dlg).Start();
 								return true;
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/PublishCommand.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/PublishCommand.cs
index 5b227d3ed1..e964c29a1b 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/PublishCommand.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/PublishCommand.cs
@@ -37,9 +37,8 @@ namespace MonoDevelop.VersionControl
 			try {
 				dlg.ModuleName = moduleName;
 				dlg.Message = GettextCatalog.GetString ("Initial check-in of module {0}", moduleName);
-				dlg.TransientFor = IdeApp.Workbench.RootWindow;
 				do {
-					if (dlg.Run () == (int) Gtk.ResponseType.Ok && dlg.Repository != null) {
+					if (MessageService.ShowCustomDialog (dlg) == (int) Gtk.ResponseType.Ok && dlg.Repository != null) {
 						AlertButton publishButton = new AlertButton ("_Publish");					
 						if (MessageService.AskQuestion (GettextCatalog.GetString ("Are you sure you want to publish the project?"), GettextCatalog.GetString ("The project will be published to the repository '{0}', module '{1}'.", dlg.Repository.Name, dlg.ModuleName), AlertButton.Cancel, publishButton) == publishButton) {
 							PublishWorker w = new PublishWorker (dlg.Repository, dlg.ModuleName, localPath, files.ToArray (), dlg.Message);
diff --git a/main/src/addins/WelcomePage/ChangeLog b/main/src/addins/WelcomePage/ChangeLog
index c0dffa1a19..48184baef3 100644
--- a/main/src/addins/WelcomePage/ChangeLog
+++ b/main/src/addins/WelcomePage/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-22  Michael Hutchinson  <mhutchinson@novell.com>
+
+	* WelcomePageView.cs: More dialog placing.
+
 2010-05-12  Michael Hutchinson  <mhutchinson@novell.com>
 
 	* WelcomePageView.cs: Use async web request instead of a
diff --git a/main/src/addins/WelcomePage/WelcomePageView.cs b/main/src/addins/WelcomePage/WelcomePageView.cs
index 4cf758ceea..88d5623cd6 100644
--- a/main/src/addins/WelcomePage/WelcomePageView.cs
+++ b/main/src/addins/WelcomePage/WelcomePageView.cs
@@ -241,18 +241,8 @@ namespace MonoDevelop.WelcomePage
 				//Launch the Uri externally
 				try {
 					DesktopService.ShowUrl (uri);
-				} catch (Exception) {
-					string msg = String.Format (GettextCatalog.GetString ("Could not open the url {0}"), uri);
-					Gtk.MessageDialog md = new Gtk.MessageDialog
-						(null, Gtk.DialogFlags.Modal| Gtk.DialogFlags.DestroyWithParent,
-						 Gtk.MessageType.Error, Gtk.ButtonsType.Ok, msg);
-					md.TransientFor = IdeApp.Workbench.RootWindow;
-					try {
-						md.Run ();
-						md.Hide ();
-					} finally {
-						md.Destroy ();
-					}
+				} catch (Exception ex) {
+					MessageService.ShowException (ex, GettextCatalog.GetString ("Could not open the url '{0}'", uri));
 				}
 			}
 		}
diff --git a/main/src/core/MonoDevelop.Ide/ChangeLog b/main/src/core/MonoDevelop.Ide/ChangeLog
index 52e03c8bae..5b75c18471 100644
--- a/main/src/core/MonoDevelop.Ide/ChangeLog
+++ b/main/src/core/MonoDevelop.Ide/ChangeLog
@@ -1,5 +1,18 @@
 2010-05-22  Michael Hutchinson  <mhutchinson@novell.com>
 
+	* gtk-gui/objects.xml: Flush.
+
+	* MonoDevelop.Ide/MessageService.cs:
+	* MonoDevelop.Ide/ProjectOperations.cs:
+	* MonoDevelop.Ide.Gui/DefaultWorkbench.cs:
+	* MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs:
+	* MonoDevelop.Components.Commands/LinkCommandEntry.cs:
+	* MonoDevelop.Components.PropertyGrid.Editors/CollectionEditor.cs:
+	* MonoDevelop.Components.PropertyGrid.Editors/FlagsSelectorDialog.cs:
+	  More dialog placing.
+
+2010-05-22  Michael Hutchinson  <mhutchinson@novell.com>
+
 	* MonoDevelop.Ide/ProjectOperations.cs: Don't destroy
 	  references dialog.
 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/LinkCommandEntry.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/LinkCommandEntry.cs
index 8aa306233d..ec3c49e921 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/LinkCommandEntry.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/LinkCommandEntry.cs
@@ -69,11 +69,7 @@ namespace MonoDevelop.Components.Commands
 				System.Diagnostics.Process.Start (url);
 			} catch (Exception) {
 				string msg = AddinManager.CurrentLocalizer.GetString ("Could not open the url {0}", url);
-				Gtk.MessageDialog md = new Gtk.MessageDialog (null, Gtk.DialogFlags.Modal | Gtk.DialogFlags.DestroyWithParent, Gtk.MessageType.Error, Gtk.ButtonsType.Ok, msg);
-				if (sender != null && sender is Gtk.Widget)
-					md.TransientFor = (sender as Gtk.Widget).Toplevel as Gtk.Window;
-				md.Run ();
-				md.Hide ();
+				MonoDevelop.Ide.MessageService.ShowError (((Gtk.Widget)sender).Toplevel as Gtk.Window, msg);
 			}
 		}
 		
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/CollectionEditor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/CollectionEditor.cs
index 067e6676e7..397647b924 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/CollectionEditor.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/CollectionEditor.cs
@@ -267,13 +267,9 @@ namespace MonoDevelop.Components.PropertyGrid.PropertyEditors
 			grid.ShowToolbar = false;

 			

 			#endregion

-

-			//show and get response			

-			ResponseType response = (ResponseType) dialog.Run();
-			dialog.Destroy ();

 			

 			//if 'OK' put items back in collection

-			if (response == ResponseType.Ok)

+			if (MonoDevelop.Ide.MessageService.RunCustomDialog (dialog, toplevel) == (int)ResponseType.Ok)

 			{
 				DesignerTransaction tran = CreateTransaction (Instance);
 				object old = collection;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FlagsSelectorDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FlagsSelectorDialog.cs
index 287073b5f9..3488ab0044 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FlagsSelectorDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FlagsSelectorDialog.cs
@@ -85,8 +85,7 @@ namespace MonoDevelop.Components.PropertyGrid.PropertyEditors
 			dialog.DefaultWidth = 500;
 			dialog.DefaultHeight = 400;
 			dialog.ShowAll ();
-			dialog.TransientFor = parent;
-			return dialog.Run ();
+			return MonoDevelop.Ide.MessageService.RunCustomDialog (dialog, parent);
 		}
 		
 		public void Dispose ()
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs
index 44cac3e255..545ea70975 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs
@@ -300,19 +300,18 @@ namespace MonoDevelop.Ide.FindInFiles
 
 		void ButtonBrowsePathsClicked (object sender, EventArgs e)
 		{
-			FolderDialog folderDialog = new FolderDialog (GettextCatalog.GetString ("Select directory"));
-			try {
-				string defaultFolder = this.comboboxentryPath.Entry.Text;
-				if (string.IsNullOrEmpty (defaultFolder))
-					defaultFolder = IdeApp.ProjectOperations.ProjectsDefaultPath;
-				if (!string.IsNullOrEmpty (defaultFolder))
-					folderDialog.SetFilename (defaultFolder);
-				folderDialog.TransientFor = IdeApp.Workbench.RootWindow;
-				if (folderDialog.Run () == (int)Gtk.ResponseType.Ok)
-					this.comboboxentryPath.Entry.Text = folderDialog.Filename;
-			} finally {
-				folderDialog.Destroy ();
-			}
+			var dlg = new SelectFolderDialog (GettextCatalog.GetString ("Select directory")) {
+				TransientFor = this,
+			};
+			
+			string defaultFolder = this.comboboxentryPath.Entry.Text;
+			if (string.IsNullOrEmpty (defaultFolder))
+				defaultFolder = IdeApp.ProjectOperations.ProjectsDefaultPath;
+			if (!string.IsNullOrEmpty (defaultFolder))
+				dlg.CurrentFolder = defaultFolder;
+			
+			if (dlg.Run ())
+				this.comboboxentryPath.Entry.Text = dlg.SelectedFile;
 		}
 
 		void CheckbuttonRecursivelyDestroyed (object sender, EventArgs e)
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs
index b0edbe68e6..8832e17bcc 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs
@@ -657,9 +657,7 @@ namespace MonoDevelop.Ide.Gui
 			if (showDirtyDialog) {
 				DirtyFilesDialog dlg = new DirtyFilesDialog ();
 				dlg.Modal = true;
-				dlg.TransientFor = this;
-				int response = dlg.Run ();
-				if (response != (int)Gtk.ResponseType.Ok)
+				if (MessageService.RunCustomDialog (dlg, this) != (int)Gtk.ResponseType.Ok)
 					return false;
 			}
 			
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/MessageService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/MessageService.cs
index d3b53f83fb..adb54175da 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/MessageService.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/MessageService.cs
@@ -271,6 +271,11 @@ namespace MonoDevelop.Ide
 			}
 		}
 		
+		public static int RunCustomDialog (Gtk.Dialog dialog)
+		{
+			return RunCustomDialog (dialog, rootWindow);
+		}
+		
 		/// <summary>
 		/// Places and runs a transient dialog. Does not destroy it, so values can be retrieved from its widgets.
 		/// </summary>
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs
index 3a5d4bd88d..48a63c20ec 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs
@@ -728,7 +728,7 @@ namespace MonoDevelop.Ide
 				selDialog.SetProject (project);
 
 				if (MessageService.RunCustomDialog (selDialog) == (int)Gtk.ResponseType.Ok) {
-					ProjectReferenceCollection newRefs = selDialog.ReferenceInformations;
+					var newRefs = selDialog.ReferenceInformations;
 					
 					ArrayList toDelete = new ArrayList ();
 					foreach (ProjectReference refInfo in project.References)
diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/objects.xml b/main/src/core/MonoDevelop.Ide/gtk-gui/objects.xml
index 37803f3d07..0c7342e6e4 100644
--- a/main/src/core/MonoDevelop.Ide/gtk-gui/objects.xml
+++ b/main/src/core/MonoDevelop.Ide/gtk-gui/objects.xml
@@ -115,7 +115,7 @@
         <property name="DialogTitle" />
         <property name="DefaultFilter" />
         <property name="EntryIsEditable" />
-        <property name="AllowInvalidValues" />
+        <property name="VerifyFileExistsInProject" />
       </itemgroup>
     </itemgroups>
     <signals />