beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #1317 from jv42/master

Browse source 
Fixed Windows compilation.
This commit is contained in:
Hylke Bons 2013-06-25 07:15:42 -07:00
parent 0bb6e13d12 8b87d48f6e
commit 3e5f97d7c6
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
SparkleLib/SparkleWrappers.cs
View file

@ -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)

2
SparkleShare/Windows/SparkleController.cs
View file

@ -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 ();
}

6
SparkleShare/Windows/SparkleShare.csproj
View file

@ -246,6 +246,10 @@
<EmbeddedResource Include="Pixmaps\tutorial-slide-3.png" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\SparkleLib\Git\SparkleLib.Git.csproj">
<Project>{009FDCD7-1D57-4202-BB6D-8477D8C6B8EE}</Project>
<Name>SparkleLib.Git</Name>
</ProjectReference>
<ProjectReference Include="..\..\SparkleLib\SparkleLib.csproj">
<Project>{2C914413-B31C-4362-93C7-1AE34F09112A}</Project>
<Name>SparkleLib</Name>
@ -254,4 +258,4 @@
<ItemGroup>
<Content Include="Pixmaps\sparkleshare-folder.ico" />
</ItemGroup>
</Project>
</Project>