From d107fd692d2c538a084bbd68f90ca8fafa687f2a Mon Sep 17 00:00:00 2001
From: Hylke Bons <hylkebons@gmail.com>
Date: Tue, 11 May 2010 01:03:35 +0100
Subject: [PATCH] fix path and cleanups

---
 SparkleShare/SparkleRepo.cs   | 2 --
 SparkleShare/SparkleWindow.cs | 8 ++++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/SparkleShare/SparkleRepo.cs b/SparkleShare/SparkleRepo.cs
index 8a3bcca9..11ffd3a5 100644
--- a/SparkleShare/SparkleRepo.cs
+++ b/SparkleShare/SparkleRepo.cs
@@ -264,13 +264,11 @@ namespace SparkleShare {
 
 		// Pushes the changes to the remote repo
 		public void Push () {
-			// TODO: What happens when network disconnects during a push
 			Console.WriteLine ("[Git][" + Name + "] Pushing changes...");
 			Process.StartInfo.Arguments = "push";
 			Process.Start();
 			Process.WaitForExit ();
 			Console.WriteLine ("[Git][" + Name + "] Changes pushed.");
-
 //			SparkleUI.NotificationIcon.SetIdleState ();
 		}
 
diff --git a/SparkleShare/SparkleWindow.cs b/SparkleShare/SparkleWindow.cs
index f161ecd4..01695581 100644
--- a/SparkleShare/SparkleWindow.cs
+++ b/SparkleShare/SparkleWindow.cs
@@ -106,8 +106,6 @@ namespace SparkleShare {
 				LayoutVertical.PackStart (DialogButtons, false, false, 0);
 
 
-
-			// Fetch remote changes every 20 seconds
 /*			Timer RedrawTimer = new Timer ();
 			RedrawTimer.Interval = 5000;
 			RedrawTimer.Elapsed += delegate { 
@@ -486,7 +484,8 @@ namespace SparkleShare {
 						AddDialog.Remove (AddDialog.Child);
 							VBox Box = new VBox (false, 24);
 							SparkleSpinner Spinner = new SparkleSpinner ();
-							Label Label = new Label ("Downloading files,\nthis may take a while...");
+							Label Label = new Label ("Downloading files,\n" + 
+							                         "this may take a while...");
 							Box.PackStart (Spinner, false, false, 0);
 							Box.PackStart (Label, false, false, 0);
 						AddDialog.BorderWidth = 30;
@@ -556,7 +555,8 @@ namespace SparkleShare {
 		}
 
 		public void Quit (object o, EventArgs args) {
-			File.Delete (SparklePaths.SparkleTmpPath + "sparkleshare.pid");
+			File.Delete (SparkleHelpers.CombineMore (SparklePaths.SparkleTmpPath +
+			                                         "sparkleshare.pid"));
 			Application.Quit ();
 		}