Merge remote-tracking branch 'origin/master' into roslyn

1 files changed, 4 insertions, 7 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FilePathEditor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FilePathEditor.cs
index 37da6db915..9f4149a059 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FilePathEditor.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.PropertyGrid.Editors/FilePathEditor.cs
@@ -26,9 +26,7 @@
 
 using System;
 using System.Linq;
-
 using MonoDevelop.Core;
-using MonoDevelop.Components.Extensions;
 
 namespace MonoDevelop.Components.PropertyGrid.PropertyEditors
 {
@@ -42,17 +40,16 @@ namespace MonoDevelop.Components.PropertyGrid.PropertyEditors
 		public override void LaunchDialogue ()
 		{
 			var kindAtt = this.Property.Attributes.OfType<FilePathIsFolderAttribute> ().FirstOrDefault ();
-			SelectFileDialogAction action;
-
+			FileChooserAction action;
 			string title;
 			if (kindAtt == null) {
-				action = SelectFileDialogAction.Open;
+				action = FileChooserAction.Open;
 				title = GettextCatalog.GetString ("Select File...");
 			} else {
-				action = SelectFileDialogAction.SelectFolder;
+				action = FileChooserAction.SelectFolder;
 				title = GettextCatalog.GetString ("Select Folder...");
 			}
-			var fs = new SelectFileDialog (title, action);
+			var fs = new MonoDevelop.Components.SelectFileDialog (title, action);
 			if (fs.Run ())
 				Property.SetValue (Instance, fs.SelectedFile);
 		}