From ac656d90e690c225e8c14654561fc622e331b6fa Mon Sep 17 00:00:00 2001 From: Julien Villers Date: Tue, 25 Jun 2013 16:04:29 +0200 Subject: [PATCH 1/2] windows: Fixed compilation. SparkleLib.SparkleGit => SparkleLib.Git Added project reference. --- SparkleShare/Windows/SparkleController.cs | 2 +- SparkleShare/Windows/SparkleShare.csproj | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/SparkleShare/Windows/SparkleController.cs b/SparkleShare/Windows/SparkleController.cs index cd80009e..dc3e00d7 100644 --- a/SparkleShare/Windows/SparkleController.cs +++ b/SparkleShare/Windows/SparkleController.cs @@ -68,7 +68,7 @@ namespace SparkleShare { Environment.SetEnvironmentVariable ("HOME", Environment.GetFolderPath (Environment.SpecialFolder.UserProfile)); StartSSH (); - SparkleLib.SparkleGit.SparkleGit.SSHPath = Path.Combine (msysgit_path, "bin", "ssh.exe"); + SparkleLib.Git.SparkleGit.SSHPath = Path.Combine (msysgit_path, "bin", "ssh.exe"); base.Initialize (); } diff --git a/SparkleShare/Windows/SparkleShare.csproj b/SparkleShare/Windows/SparkleShare.csproj index ab8cfc50..dca8b00c 100644 --- a/SparkleShare/Windows/SparkleShare.csproj +++ b/SparkleShare/Windows/SparkleShare.csproj @@ -246,6 +246,10 @@ + + {009FDCD7-1D57-4202-BB6D-8477D8C6B8EE} + SparkleLib.Git + {2C914413-B31C-4362-93C7-1AE34F09112A} SparkleLib @@ -254,4 +258,4 @@ - + \ No newline at end of file From 8b87d48f6e7224c3e9d5cc49d89e2d4a045afa35 Mon Sep 17 00:00:00 2001 From: Julien Villers Date: Tue, 25 Jun 2013 16:11:59 +0200 Subject: [PATCH 2/2] Removed pretty quotes that get rendered as ? in notification bubbles. Quick fix for the 1316 issue. --- SparkleLib/SparkleWrappers.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SparkleLib/SparkleWrappers.cs b/SparkleLib/SparkleWrappers.cs index 15cc250a..f97ec46c 100644 --- a/SparkleLib/SparkleWrappers.cs +++ b/SparkleLib/SparkleWrappers.cs @@ -43,12 +43,12 @@ namespace SparkleLib { public string ToMessage () { - string message = "added ‘{0}’"; + string message = "added '{0}'"; switch (Changes [0].Type) { - case SparkleChangeType.Edited: message = "edited ‘{0}’"; break; - case SparkleChangeType.Deleted: message = "deleted ‘{0}’"; break; - case SparkleChangeType.Moved: message = "moved ‘{0}’"; break; + case SparkleChangeType.Edited: message = "edited '{0}'"; break; + case SparkleChangeType.Deleted: message = "deleted '{0}'"; break; + case SparkleChangeType.Moved: message = "moved '{0}'"; break; } if (Changes.Count > 0)