From 2976ae6a5a5311fd4563f98619e0dd9f113d0c25 Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Sun, 2 Dec 2012 20:00:42 +0000 Subject: [PATCH] windows: fix build --- SparkleShare/SparkleStatusIconController.cs | 8 ++++---- SparkleShare/Windows/SparkleController.cs | 2 +- SparkleShare/Windows/SparkleShare.csproj | 16 ++++++---------- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/SparkleShare/SparkleStatusIconController.cs b/SparkleShare/SparkleStatusIconController.cs index cb1d9479..8729be70 100755 --- a/SparkleShare/SparkleStatusIconController.cs +++ b/SparkleShare/SparkleStatusIconController.cs @@ -217,7 +217,7 @@ namespace SparkleShare { } - public void RecentEventsClicked (object sender, EventArgs args) + public void RecentEventsClicked () { new Thread (() => { 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 (); } - public void AboutClicked (object sender, EventArgs args) + public void AboutClicked () { Program.Controller.ShowAboutWindow (); } - public void QuitClicked (object sender, EventArgs args) + public void QuitClicked () { Program.Controller.Quit (); } diff --git a/SparkleShare/Windows/SparkleController.cs b/SparkleShare/Windows/SparkleController.cs index c9b59f95..e28be872 100644 --- a/SparkleShare/Windows/SparkleController.cs +++ b/SparkleShare/Windows/SparkleController.cs @@ -231,7 +231,7 @@ namespace SparkleShare { if (ssh_pid_match.Success) { 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); diff --git a/SparkleShare/Windows/SparkleShare.csproj b/SparkleShare/Windows/SparkleShare.csproj index a0e1662b..f27ef2e3 100644 --- a/SparkleShare/Windows/SparkleShare.csproj +++ b/SparkleShare/Windows/SparkleShare.csproj @@ -177,6 +177,12 @@ + + Pixmaps\tutorial-slide-1.png + + + Pixmaps\tutorial-slide-2.png + @@ -187,10 +193,6 @@ Plugins\gitorious.png Always - - Plugins\gnome.png - Always - Plugins\own-server.png Always @@ -219,10 +221,6 @@ Plugins\gitorious.xml Always - - Plugins\gnome.xml - Always - Plugins\own-server.xml Always @@ -235,8 +233,6 @@ - -