From c5a092c8a49e6fbbeb275e6bbef4911c0f43f685 Mon Sep 17 00:00:00 2001 From: Hylke Date: Thu, 23 Jun 2011 13:56:25 +0100 Subject: [PATCH 1/2] repo: don't show warning statusicon upon initial commit --- SparkleLib/Git/SparkleRepoGit.cs | 11 ----------- SparkleLib/SparkleRepoBase.cs | 9 ++++----- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/SparkleLib/Git/SparkleRepoGit.cs b/SparkleLib/Git/SparkleRepoGit.cs index c2612d71..ef289e19 100644 --- a/SparkleLib/Git/SparkleRepoGit.cs +++ b/SparkleLib/Git/SparkleRepoGit.cs @@ -527,17 +527,6 @@ namespace SparkleLib { return message.TrimEnd (); } - - public override void CreateInitialChangeSet () - { - base.CreateInitialChangeSet (); - Add (); - - string message = FormatCommitMessage (); - Commit (message); - } - - public override bool UsesNotificationCenter { get { diff --git a/SparkleLib/SparkleRepoBase.cs b/SparkleLib/SparkleRepoBase.cs index d7e01545..da5636e0 100644 --- a/SparkleLib/SparkleRepoBase.cs +++ b/SparkleLib/SparkleRepoBase.cs @@ -86,12 +86,11 @@ namespace SparkleLib { this.status = status; }; - if (CurrentRevision == null) { - CreateInitialChangeSet (); - HasUnsyncedChanges = true; - } - CreateWatcher (); + + if (CurrentRevision == null) + CreateInitialChangeSet (); + CreateListener (); this.local_timer.Elapsed += delegate (object o, ElapsedEventArgs args) { From a9455c0608224577eed3802ed3aa68f82803e0ae Mon Sep 17 00:00:00 2001 From: Hylke Date: Fri, 24 Jun 2011 18:39:59 +0100 Subject: [PATCH 2/2] controller: trim arguments before passing to the fetcher --- SparkleShare/SparkleController.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs index 2011b54c..9abcedc5 100644 --- a/SparkleShare/SparkleController.cs +++ b/SparkleShare/SparkleController.cs @@ -877,6 +877,9 @@ namespace SparkleShare { public void FetchFolder (string server, string remote_folder) { + server = server.Trim (); + remote_folder = remote_folder.Trim (); + if (!Directory.Exists (SparklePaths.SparkleTmpPath)) Directory.CreateDirectory (SparklePaths.SparkleTmpPath);