From babf24e71368b0cb64071d1ac382dd560945ea08 Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Mon, 28 Mar 2016 21:26:56 +0100 Subject: [PATCH] mac: Fix build --- SparkleShare/Linux/SparkleController.cs | 1 - SparkleShare/Mac/SparkleController.cs | 27 ++++++++++++++----------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/SparkleShare/Linux/SparkleController.cs b/SparkleShare/Linux/SparkleController.cs index 4af83979..2d56ace3 100755 --- a/SparkleShare/Linux/SparkleController.cs +++ b/SparkleShare/Linux/SparkleController.cs @@ -82,7 +82,6 @@ namespace SparkleShare { Directory.CreateDirectory (SparkleConfig.DefaultConfig.FoldersPath); Syscall.chmod (SparkleConfig.DefaultConfig.FoldersPath, (FilePermissions) 448); // 448 -> 700 - SparkleLogger.LogInfo ("Controller", "Created '" + SparkleConfig.DefaultConfig.FoldersPath + "'"); return true; } diff --git a/SparkleShare/Mac/SparkleController.cs b/SparkleShare/Mac/SparkleController.cs index 80d2a697..198dba9c 100755 --- a/SparkleShare/Mac/SparkleController.cs +++ b/SparkleShare/Mac/SparkleController.cs @@ -128,18 +128,6 @@ namespace SparkleShare { { if (!Directory.Exists (Program.Controller.FoldersPath)) { Directory.CreateDirectory (Program.Controller.FoldersPath); - - if (Environment.OSVersion.Version.Major >= 14) { - NSWorkspace.SharedWorkspace.SetIconforFile ( - NSImage.ImageNamed ("sparkleshare-folder-yosemite.icns"), - Program.Controller.FoldersPath, 0); - - } else { - NSWorkspace.SharedWorkspace.SetIconforFile ( - NSImage.ImageNamed ("sparkleshare-folder.icns"), - Program.Controller.FoldersPath, 0); - } - Syscall.chmod (Program.Controller.FoldersPath, (FilePermissions) 448); // 448 -> 700 return true; @@ -149,6 +137,21 @@ namespace SparkleShare { } + public override void SetFolderIcon () + { + if (Environment.OSVersion.Version.Major >= 14) { + NSWorkspace.SharedWorkspace.SetIconforFile ( + NSImage.ImageNamed ("sparkleshare-folder-yosemite.icns"), + Program.Controller.FoldersPath, 0); + + } else { + NSWorkspace.SharedWorkspace.SetIconforFile ( + NSImage.ImageNamed ("sparkleshare-folder.icns"), + Program.Controller.FoldersPath, 0); + } + } + + public override void OpenFolder (string path) { path = Uri.UnescapeDataString (path);