Merge branch 'master' into newresolver

2 files changed, 3 insertions, 8 deletions

diff --git a/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.PlistEditor/CustomPropertiesWidget.cs b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.PlistEditor/CustomPropertiesWidget.cs
index bb1bf8e910..92b6fcd8b9 100644
--- a/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.PlistEditor/CustomPropertiesWidget.cs
+++ b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.PlistEditor/CustomPropertiesWidget.cs
@@ -323,7 +323,7 @@ namespace MonoDevelop.MacDev.PlistEditor
 				if (!treeview1.Selection.GetSelected (out iter))
 					return;
 				
-				PObject obj;
+				PObject obj = null;
 				if (treeStore.IterParent (out iter, iter))
 					obj = (PObject) treeStore.GetValue (iter, 1);
 				obj = obj ?? nsDictionary;
diff --git a/main/src/addins/MonoDevelop.MacDev/XcodeSyncing/XcodeSyncedContent.cs b/main/src/addins/MonoDevelop.MacDev/XcodeSyncing/XcodeSyncedContent.cs
index d62cc6a8e7..a1bc4b6e64 100644
--- a/main/src/addins/MonoDevelop.MacDev/XcodeSyncing/XcodeSyncedContent.cs
+++ b/main/src/addins/MonoDevelop.MacDev/XcodeSyncing/XcodeSyncedContent.cs
@@ -57,18 +57,13 @@ namespace MonoDevelop.MacDev.XcodeSyncing
 		
 		public override void SyncOut (XcodeSyncContext context)
 		{
-			FilePath target = context.ProjectDir.Combine (targetRelative);
+			var target = context.ProjectDir.Combine (targetRelative);
 			var dir = target.ParentDirectory;
 			if (!Directory.Exists (dir))
 				Directory.CreateDirectory (dir);
 			if (File.Exists (target))
 				File.Delete (target);
-			try {
-				var result = Mono.Unix.Native.Syscall.link (source, target);
-				Mono.Unix.UnixMarshal.ThrowExceptionForLastErrorIf (result);
-			} catch {
-				File.Copy (source, target);
-			}
+			File.Copy (source, target);
 			context.UpdateSyncTime (targetRelative);
 		}