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

fix crash due to change in path concatenations

Browse source
This commit is contained in:
Hylke Bons 2010-06-05 00:22:58 +02:00
parent 256afe3a5e
commit d0092847ab
5 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SparkleShare/SparkleHelpers.cs
View file

@ -49,7 +49,7 @@ namespace SparkleShare {
WebClient WebClient = new WebClient (); WebClient WebClient = new WebClient ();
Uri GravatarUri = new Uri ("http://www.gravatar.com/avatar/" + Uri GravatarUri = new Uri ("http://www.gravatar.com/avatar/" +
GetMD5 (Email) + ".jpg?s=" + Size + "&d=404"); GetMD5 (Email) + ".jpg?s=" + Size + "&d=404");
// TODO: Clean paths
string TmpFile = SparklePaths.SparkleTmpPath + Email + Size; string TmpFile = SparklePaths.SparkleTmpPath + Email + Size;
if (!File.Exists (TmpFile)) { if (!File.Exists (TmpFile)) {

3
SparkleShare/SparklePaths.cs
View file

@ -23,7 +23,8 @@ namespace SparkleShare {
public static class SparklePaths { public static class SparklePaths {
public static string SparkleTmpPath = public static string SparkleTmpPath =
Path.Combine ("tmp", "sparkleshare"); SparkleHelpers.CombineMore (Path.VolumeSeparatorChar.ToString (),
"tmp", "sparkleshare");
private static UnixUserInfo UnixUserInfo = private static UnixUserInfo UnixUserInfo =
new UnixUserInfo (UnixEnvironment.UserName); new UnixUserInfo (UnixEnvironment.UserName);

2
SparkleShare/SparkleStatusIcon.cs
View file

@ -100,7 +100,7 @@ namespace SparkleShare {
Menu.Add (new SeparatorMenuItem ()); Menu.Add (new SeparatorMenuItem ());
CheckMenuItem NotifyCheckMenuItem = CheckMenuItem NotifyCheckMenuItem =
new CheckMenuItem (_("Show notifications")); new CheckMenuItem (_("Show Notifications"));
Menu.Add (NotifyCheckMenuItem); Menu.Add (NotifyCheckMenuItem);
Menu.Add (new SeparatorMenuItem ()); Menu.Add (new SeparatorMenuItem ());

2
SparkleShare/SparkleUI.cs
View file

@ -98,7 +98,7 @@ namespace SparkleShare {
case "GNOME": case "GNOME":
Process.StartInfo.FileName = "gvfs-set-attribute"; Process.StartInfo.FileName = "gvfs-set-attribute";
Process.StartInfo.Arguments = Process.StartInfo.Arguments =
Folder + " metadata::emblems [synced]"; "-t string " + Folder + " metadata::emblems [synced]";
Process.Start (); Process.Start ();
break; break;
} }

10
SparkleShare/SparkleWindow.cs
View file

@ -226,7 +226,6 @@ namespace SparkleShare {
typeof (string), typeof (string),
typeof (string)); typeof (string));
int i = 0; int i = 0;
TreeIter Iter; TreeIter Iter;
TreePath TreePath; TreePath TreePath;
@ -241,14 +240,15 @@ namespace SparkleShare {
string UserName = Parts [0]; string UserName = Parts [0];
string UserEmail = Parts [1]; 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 // Actually add to the list
Iter = PeopleStore.Prepend (); Iter = PeopleStore.Prepend ();
PeopleStore.SetValue (Iter, 0, PeopleStore.SetValue (Iter, 0,
SparkleHelpers.GetAvatar (UserEmail , 32)); 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, PeopleStore.SetValue (Iter, 1,
"<b>" + UserName + "</b>\n" + "<b>" + UserName + "</b>\n" +
"<span font_size=\"smaller\">" + "<span font_size=\"smaller\">" +