Merge branch 'master' into roslyn

Conflicts:
	main/build/MacOSX/monostub-test.m
	main/build/MacOSX/monostub-utils.h
	main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/AnalysisCommands.cs
	main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchInSolutionSearchCategory.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Components/FileEntry.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/ErrorListPad.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs
	version-checks

1 files changed, 7 insertions, 5 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 23df98afc8..37da6db915 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,8 +26,9 @@
 
 using System;
 using System.Linq;
-using Gtk;
+
 using MonoDevelop.Core;
+using MonoDevelop.Components.Extensions;
 
 namespace MonoDevelop.Components.PropertyGrid.PropertyEditors
 {
@@ -41,16 +42,17 @@ namespace MonoDevelop.Components.PropertyGrid.PropertyEditors
 		public override void LaunchDialogue ()
 		{
 			var kindAtt = this.Property.Attributes.OfType<FilePathIsFolderAttribute> ().FirstOrDefault ();
-			FileChooserAction action;
+			SelectFileDialogAction action;
+
 			string title;
 			if (kindAtt == null) {
-				action = FileChooserAction.Open;
+				action = SelectFileDialogAction.Open;
 				title = GettextCatalog.GetString ("Select File...");
 			} else {
-				action = FileChooserAction.SelectFolder;
+				action = SelectFileDialogAction.SelectFolder;
 				title = GettextCatalog.GetString ("Select Folder...");
 			}
-			var fs = new MonoDevelop.Components.SelectFileDialog (title, action);
+			var fs = new SelectFileDialog (title, action);
 			if (fs.Run ())
 				Property.SetValue (Instance, fs.SelectedFile);
 		}