From eea38eb0f0eb95bedffa2b374f4880e5409bc6ea Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Wed, 11 Aug 2010 23:53:32 +0100 Subject: [PATCH] [statusicon] Fix bug where the size of a temporary directory is checked that may not exist anymore --- SparkleLib/SparkleRepo.cs | 2 ++ SparkleShare/SparkleStatusIcon.cs | 5 +++-- data/sparkleshare.invitation | 6 ++++++ 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 data/sparkleshare.invitation diff --git a/SparkleLib/SparkleRepo.cs b/SparkleLib/SparkleRepo.cs index 8619ccc6..1a31d818 100644 --- a/SparkleLib/SparkleRepo.cs +++ b/SparkleLib/SparkleRepo.cs @@ -311,6 +311,8 @@ namespace SparkleLib { public void Rebase () { + Add (); // TODO: Experiment for the "You have unstaged changes" bug + Watcher.EnableRaisingEvents = false; SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Rebasing changes..."); diff --git a/SparkleShare/SparkleStatusIcon.cs b/SparkleShare/SparkleStatusIcon.cs index 067a2601..c32b338e 100644 --- a/SparkleShare/SparkleStatusIcon.cs +++ b/SparkleShare/SparkleStatusIcon.cs @@ -131,9 +131,10 @@ namespace SparkleShare { double size = 0; - FileInfo [] files = parent.GetFiles(); + if (!parent.Name.Equals ("rebase-apply")) + return 0; - foreach (FileInfo file in files) { + foreach (FileInfo file in parent.GetFiles()) { if (!file.Exists) return 0; diff --git a/data/sparkleshare.invitation b/data/sparkleshare.invitation new file mode 100644 index 00000000..33b48b43 --- /dev/null +++ b/data/sparkleshare.invitation @@ -0,0 +1,6 @@ + + + git.gnome.org + gnome-design + a22bc6f4b9ffe8e5acd4be0838d41aa10a1187dd +