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

fix warning

Browse source
This commit is contained in:
Hylke Bons 2010-04-30 00:51:27 +01:00
parent 9f4af94f47
commit 93d9c21716
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/SparklePony.cs
View file

@ -41,6 +41,8 @@ using System.Text.RegularExpressions;
public class SparklePony { public class SparklePony {
public static SparklePonyUI SparklePonyUI;
public static void Main (string [] args) { public static void Main (string [] args) {
// Check if git is installed // Check if git is installed
@ -74,7 +76,7 @@ public class SparklePony {
} }
Gtk.Application.Init (); Gtk.Application.Init ();
SparklePonyUI SparklePonyUI = new SparklePonyUI (HideUI); SparklePonyUI = new SparklePonyUI (HideUI);
SparklePonyUI.StartMonitoring (); SparklePonyUI.StartMonitoring ();
Gtk.Application.Run (); Gtk.Application.Run ();
} }
@ -434,43 +436,43 @@ public class Repository {
foreach (string Line in Regex.Split (Output, "\n")) { foreach (string Line in Regex.Split (Output, "\n")) {
if (Line.IndexOf ("new file:") > -1 && !DoneAddCommit) { if (Line.IndexOf ("new file:") > -1 && !DoneAddCommit) {
DoneAddCommit = true;
if (FilesAdded > 1) if (FilesAdded > 1)
return "In '" + Name + "', " + UserName + " added '" + return "In '" + Name + "', " + UserName + " added '" +
Line.Replace ("#\tnew file:", "").Trim () + "' and " + (FilesAdded - 1) + " more."; Line.Replace ("#\tnew file:", "").Trim () + "' and " + (FilesAdded - 1) + " more.";
else else
return "In '" + Name + "', " + UserName + " added '" + return "In '" + Name + "', " + UserName + " added '" +
Line.Replace ("#\tnew file:", "").Trim () + "'."; Line.Replace ("#\tnew file:", "").Trim () + "'.";
DoneAddCommit = true;
} }
if (Line.IndexOf ("modified:") > -1 && !DoneEditCommit) { if (Line.IndexOf ("modified:") > -1 && !DoneEditCommit) {
DoneEditCommit = true;
if (FilesEdited > 1) if (FilesEdited > 1)
return "In '" + Name + "', " + UserName + " edited '" + return "In '" + Name + "', " + UserName + " edited '" +
Line.Replace ("#\tmodified:", "").Trim () + "' and " + (FilesEdited - 1) + " more."; Line.Replace ("#\tmodified:", "").Trim () + "' and " + (FilesEdited - 1) + " more.";
else else
return "In '" + Name + "', " + UserName + " edited '" + return "In '" + Name + "', " + UserName + " edited '" +
Line.Replace ("#\tmodified:", "").Trim () + "'."; Line.Replace ("#\tmodified:", "").Trim () + "'.";
DoneEditCommit = true;
} }
if (Line.IndexOf ("renamed:") > -1 && !DoneRenameCommit) { if (Line.IndexOf ("renamed:") > -1 && !DoneRenameCommit) {
DoneDeleteCommit = true;
if (FilesRenamed > 1) if (FilesRenamed > 1)
return "In '" + Name + "', " + UserName + " renamed '" + return "In '" + Name + "', " + UserName + " renamed '" +
Line.Replace ("#\trenamed:", "").Trim ().Replace (" -> ", "' to '") + "' and " + (FilesDeleted - 1) + " more."; Line.Replace ("#\trenamed:", "").Trim ().Replace (" -> ", "' to '") + "' and " + (FilesDeleted - 1) + " more.";
else else
return "In '" + Name + "', " + UserName + " renamed '" + return "In '" + Name + "', " + UserName + " renamed '" +
Line.Replace ("#\trenamed:", "").Trim ().Replace (" -> ", "' to '") + "'."; Line.Replace ("#\trenamed:", "").Trim ().Replace (" -> ", "' to '") + "'.";
DoneDeleteCommit = true;
} }
if (Line.IndexOf ("deleted:") > -1 && !DoneDeleteCommit) { if (Line.IndexOf ("deleted:") > -1 && !DoneDeleteCommit) {
DoneDeleteCommit = true;
if (FilesDeleted > 1) if (FilesDeleted > 1)
return "In '" + Name + "', " + UserName + " deleted '" + return "In '" + Name + "', " + UserName + " deleted '" +
Line.Replace ("#\tdeleted:", "").Trim () + "' and " + (FilesDeleted - 1) + " more."; Line.Replace ("#\tdeleted:", "").Trim () + "' and " + (FilesDeleted - 1) + " more.";
else else
return "In '" + Name + "', " + UserName + " deleted '" + return "In '" + Name + "', " + UserName + " deleted '" +
Line.Replace ("#\tdeleted:", "").Trim () + "'."; Line.Replace ("#\tdeleted:", "").Trim () + "'.";
DoneDeleteCommit = true;
} }
} }
@ -643,7 +645,7 @@ public class SparklePonyWindow : Window {
Process.StartInfo.FileName = "git"; Process.StartInfo.FileName = "git";
Process.StartInfo.Arguments = "log --pretty=oneline -20"; Process.StartInfo.Arguments = "log --pretty=oneline -20";
Process.StartInfo.WorkingDirectory = Repositories [0].RepoPath; Process.StartInfo.WorkingDirectory = Repositories [1].RepoPath;
Process.Start(); Process.Start();
string Output = Process.StandardOutput.ReadToEnd().Trim (); string Output = Process.StandardOutput.ReadToEnd().Trim ();