From d0092847ab446fdca04b05219f1634bbb5918023 Mon Sep 17 00:00:00 2001
From: Hylke Bons <hylkebons@gmail.com>
Date: Sat, 5 Jun 2010 00:22:58 +0200
Subject: [PATCH] fix crash due to change in path concatenations

---
 SparkleShare/SparkleHelpers.cs    |  2 +-
 SparkleShare/SparklePaths.cs      |  3 ++-
 SparkleShare/SparkleStatusIcon.cs |  2 +-
 SparkleShare/SparkleUI.cs         |  2 +-
 SparkleShare/SparkleWindow.cs     | 10 +++++-----
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/SparkleShare/SparkleHelpers.cs b/SparkleShare/SparkleHelpers.cs
index b4980303..3101ea12 100644
--- a/SparkleShare/SparkleHelpers.cs
+++ b/SparkleShare/SparkleHelpers.cs
@@ -49,7 +49,7 @@ namespace SparkleShare {
 				WebClient WebClient = new WebClient ();
 				Uri GravatarUri = new Uri ("http://www.gravatar.com/avatar/" + 
 				                   GetMD5 (Email) + ".jpg?s=" + Size + "&d=404");
-
+				// TODO: Clean paths
 				string TmpFile = SparklePaths.SparkleTmpPath + Email + Size;
 
 				if (!File.Exists (TmpFile)) {
diff --git a/SparkleShare/SparklePaths.cs b/SparkleShare/SparklePaths.cs
index de917636..500041cf 100644
--- a/SparkleShare/SparklePaths.cs
+++ b/SparkleShare/SparklePaths.cs
@@ -23,7 +23,8 @@ namespace SparkleShare {
 	public static class SparklePaths {
 
 		public static string SparkleTmpPath =
-			Path.Combine ("tmp", "sparkleshare");
+			SparkleHelpers.CombineMore (Path.VolumeSeparatorChar.ToString (),
+			                            "tmp", "sparkleshare");
 
 		private static UnixUserInfo UnixUserInfo =
 			new UnixUserInfo (UnixEnvironment.UserName);
diff --git a/SparkleShare/SparkleStatusIcon.cs b/SparkleShare/SparkleStatusIcon.cs
index f70d5f40..c98e37cf 100644
--- a/SparkleShare/SparkleStatusIcon.cs
+++ b/SparkleShare/SparkleStatusIcon.cs
@@ -100,7 +100,7 @@ namespace SparkleShare {
 				Menu.Add (new SeparatorMenuItem ());
 
 				CheckMenuItem NotifyCheckMenuItem =
-					new CheckMenuItem (_("Show notifications"));
+					new CheckMenuItem (_("Show Notifications"));
 				Menu.Add (NotifyCheckMenuItem);
 				Menu.Add (new SeparatorMenuItem ());
 
diff --git a/SparkleShare/SparkleUI.cs b/SparkleShare/SparkleUI.cs
index c8917522..9dd66d6e 100644
--- a/SparkleShare/SparkleUI.cs
+++ b/SparkleShare/SparkleUI.cs
@@ -98,7 +98,7 @@ namespace SparkleShare {
 						case "GNOME":
 							Process.StartInfo.FileName = "gvfs-set-attribute";
 							Process.StartInfo.Arguments =
-								Folder + " metadata::emblems [synced]";
+								"-t string " + Folder + " metadata::emblems [synced]";
 							Process.Start ();
 						break;
 					}
diff --git a/SparkleShare/SparkleWindow.cs b/SparkleShare/SparkleWindow.cs
index 88bea327..cd3a8fea 100644
--- a/SparkleShare/SparkleWindow.cs
+++ b/SparkleShare/SparkleWindow.cs
@@ -226,7 +226,6 @@ namespace SparkleShare {
 				                                    typeof (string),
 				                                    typeof (string));
 
-
 			int i = 0;
 			TreeIter Iter;
 			TreePath TreePath;
@@ -241,14 +240,15 @@ namespace SparkleShare {
 					string UserName  = Parts [0];
 					string UserEmail = Parts [1];
 
-					// Do something special if the person is you
-					if (UserEmail.Equals (SparkleRepo.UserEmail))
-						UserEmail = _("That’s you!");
-
 					// Actually add to the list
 					Iter = PeopleStore.Prepend ();
 					PeopleStore.SetValue (Iter, 0,
 					                      SparkleHelpers.GetAvatar (UserEmail , 32));
+
+					// Do something special if the person is you
+					if (UserEmail.Equals (SparkleRepo.UserEmail))
+						UserEmail = _("That’s you!");
+
 					PeopleStore.SetValue (Iter, 1,
 					                      "<b>" + UserName + "</b>\n" +
 					                      "<span font_size=\"smaller\">" +