Merge branch 'master' into newresolver

Conflicts:
	main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs
	main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ClassOutlineNodeComparer.cs
	main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ClassOutlineTextEditorExtension.cs
	main/src/addins/MonoDevelop.MacDev/Makefile.am
	main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.csproj
	main/src/addins/MonoDevelop.MacDev/ObjCIntegration/CSharpCodeCodebehind.cs
	main/src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor/XmlDocumentParser.cs
	main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
	main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom.Parser/ProjectDomService.cs
	main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom/DomCecilCompilationUnit.cs

2 files changed, 2 insertions, 31 deletions

diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.Components/Widgets/DataGrid/DataGrid.cs b/extras/MonoDevelop.Database/MonoDevelop.Database.Components/Widgets/DataGrid/DataGrid.cs
index b2b207dc4b..eb4cddf521 100644
--- a/extras/MonoDevelop.Database/MonoDevelop.Database.Components/Widgets/DataGrid/DataGrid.cs
+++ b/extras/MonoDevelop.Database/MonoDevelop.Database.Components/Widgets/DataGrid/DataGrid.cs
@@ -70,7 +70,6 @@ namespace MonoDevelop.Database.Components
 			
 			//Gtk# 2.10: grid.EnableGridLines = TreeViewGridLines.Both;
 			grid.ButtonPressEvent += new ButtonPressEventHandler (ButtonPressed);
-			grid.Selection.Mode = SelectionMode.Multiple;
 
 			contentRenderers = new Dictionary<Type, IDataGridContentRenderer> ();
 			
@@ -388,10 +387,8 @@ namespace MonoDevelop.Database.Components
 				return;
 			}
 			
-			if (args.Event.Button == 3) {
+			if (args.Event.Button == 3)
 				IdeApp.CommandService.ShowContextMenu ("/MonoDevelop/Database/ContextMenu/DataGrid");
-				args.RetVal = true;
-			}
 		}
 		
 		private static string ByteConvertFunc (object obj)
@@ -411,32 +408,6 @@ namespace MonoDevelop.Database.Components
 			sbyte b = (sbyte)obj;
 			return b.ToString ("N");
 		}
-
-		[CommandHandler (MonoDevelop.Ide.Commands.EditCommands.Copy)]
-		protected void CopyCommand ()
-		{
-			Gtk.TreePath[] selectedRows = grid.Selection.GetSelectedRows ();
-			string result = String.Empty;
-			TreeIter iter;
-			for (int i = 0; i < selectedRows.Length; i++) {
-				store.GetIter (out iter,selectedRows[i]);
-				string [] row = new string[columnCount];
-				for (int j = 0; j < columnCount; j++) {
-					object val = store.GetValue (iter,j);
-					row[j] =  val != null ? val.ToString (): String.Empty;
-				}
-				result += String.Join ("\t",row);
-				result += System.Environment.NewLine;
-			}
-			Clipboard clipboard = Clipboard.Get (Gdk.Atom.Intern ("CLIPBOARD", false));
-			clipboard.Text = result;
-		}
-
-		[CommandHandler (MonoDevelop.Ide.Commands.EditCommands.SelectAll)]
-		protected void SelectAllCommand ()
-		{
-			grid.Selection.SelectAll ();
-		}
 		
 		[CommandHandler (DataGridCommands.VisualizeAsList)]
 		protected void VisualizeAsListCommand (object obj)
diff --git a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql/ConnectionContextService.cs b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql/ConnectionContextService.cs
index 13d9690f2a..a5f2340ec1 100644
--- a/extras/MonoDevelop.Database/MonoDevelop.Database.Sql/ConnectionContextService.cs
+++ b/extras/MonoDevelop.Database/MonoDevelop.Database.Sql/ConnectionContextService.cs
@@ -49,7 +49,7 @@ namespace MonoDevelop.Database.Sql
 
 		static ConnectionContextService ()
 		{
-			configFile = Path.Combine (PropertyService.Locations.Config, "MonoDevelop.Database.ConnectionManager.xml");
+			configFile = Path.Combine (UserProfile.Current.ConfigDir, "MonoDevelop.Database.ConnectionManager.xml");
 			Initialize (configFile);
 		}