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

windows: fix build

Browse source
This commit is contained in:
Hylke Bons 2012-12-02 20:00:42 +00:00
parent f573666edb
commit 2976ae6a5a
3 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
SparkleShare/SparkleStatusIconController.cs
View file

@ -217,7 +217,7 @@ namespace SparkleShare {
} }
public void RecentEventsClicked (object sender, EventArgs args) public void RecentEventsClicked ()
{ {
new Thread (() => { new Thread (() => {
while (!Program.Controller.RepositoriesLoaded) while (!Program.Controller.RepositoriesLoaded)
@ -229,19 +229,19 @@ namespace SparkleShare {
} }
public void AddHostedProjectClicked (object sender, EventArgs args) public void AddHostedProjectClicked ()
{ {
new Thread (() => Program.Controller.ShowSetupWindow (PageType.Add)).Start (); new Thread (() => Program.Controller.ShowSetupWindow (PageType.Add)).Start ();
} }
public void AboutClicked (object sender, EventArgs args) public void AboutClicked ()
{ {
Program.Controller.ShowAboutWindow (); Program.Controller.ShowAboutWindow ();
} }
public void QuitClicked (object sender, EventArgs args) public void QuitClicked ()
{ {
Program.Controller.Quit (); Program.Controller.Quit ();
} }

2
SparkleShare/Windows/SparkleController.cs
View file

@ -231,7 +231,7 @@ namespace SparkleShare {
if (ssh_pid_match.Success) { if (ssh_pid_match.Success) {
Int32.TryParse (ssh_pid_match.Groups [1].Value, out this.ssh_agent_pid); Int32.TryParse (ssh_pid_match.Groups [1].Value, out this.ssh_agent_pid);
Environment.SetEnvironmentVariable ("SSH_AGENT_PID", this.ssh_agent_pid); Environment.SetEnvironmentVariable ("SSH_AGENT_PID", "" + this.ssh_agent_pid);
SparkleLogger.LogInfo ("Controller", "ssh-agent started, PID=" + this.ssh_agent_pid); SparkleLogger.LogInfo ("Controller", "ssh-agent started, PID=" + this.ssh_agent_pid);

16
SparkleShare/Windows/SparkleShare.csproj
View file

@ -177,6 +177,12 @@
<EmbeddedResource Include="Pixmaps\process-syncing-idle.png" /> <EmbeddedResource Include="Pixmaps\process-syncing-idle.png" />
<EmbeddedResource Include="Pixmaps\process-syncing-up.png" /> <EmbeddedResource Include="Pixmaps\process-syncing-up.png" />
<EmbeddedResource Include="Pixmaps\process-syncing.png" /> <EmbeddedResource Include="Pixmaps\process-syncing.png" />
<EmbeddedResource Include="..\Common\Pixmaps\tutorial-slide-1.png">
<Link>Pixmaps\tutorial-slide-1.png</Link>
</EmbeddedResource>
<EmbeddedResource Include="..\Common\Pixmaps\tutorial-slide-2.png">
<Link>Pixmaps\tutorial-slide-2.png</Link>
</EmbeddedResource>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="..\Common\Plugins\github.png"> <None Include="..\Common\Plugins\github.png">
@ -187,10 +193,6 @@
<Link>Plugins\gitorious.png</Link> <Link>Plugins\gitorious.png</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<None Include="..\Common\Plugins\gnome.png">
<Link>Plugins\gnome.png</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="..\Common\Plugins\own-server.png"> <None Include="..\Common\Plugins\own-server.png">
<Link>Plugins\own-server.png</Link> <Link>Plugins\own-server.png</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@ -219,10 +221,6 @@
<Link>Plugins\gitorious.xml</Link> <Link>Plugins\gitorious.xml</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<None Include="..\Common\Plugins\gnome.xml">
<Link>Plugins\gnome.xml</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="..\Common\Plugins\own-server.xml"> <None Include="..\Common\Plugins\own-server.xml">
<Link>Plugins\own-server.xml</Link> <Link>Plugins\own-server.xml</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@ -235,8 +233,6 @@
<EmbeddedResource Include="Pixmaps\sparkleshare-folder.png" /> <EmbeddedResource Include="Pixmaps\sparkleshare-folder.png" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="Pixmaps\tutorial-slide-1.png" />
<EmbeddedResource Include="Pixmaps\tutorial-slide-2.png" />
<EmbeddedResource Include="Pixmaps\tutorial-slide-3.png" /> <EmbeddedResource Include="Pixmaps\tutorial-slide-3.png" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>