From 231594186f704b4cf14db9d4479e852e07da5083 Mon Sep 17 00:00:00 2001
From: Hylke Bons <hylkebons@gmail.com>
Date: Sun, 22 Jan 2012 13:49:29 +0000
Subject: [PATCH] event log: update size info after the html

---
 NEWS                                      | 5 ++++-
 SparkleShare/Mac/SparkleShare.csproj      | 2 +-
 SparkleShare/SparkleControllerBase.cs     | 2 +-
 SparkleShare/SparkleEventLogController.cs | 4 +++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index c74384cb..07176044 100755
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,13 @@
-0.8.0 for Linux and Mac (Sat Jan 14):
+0.8.0 for Linux and Mac (Sun Jan 22):
 
         Hylke:
         - Show syncing progress in the status icon
         - Hide dock icon on Mac until you open a window
         - Update dates in the event log after midnight
         - Don't let git compress already compressed files (.jpg .ogg .zip, etc.)
+        - Limit git's memory usage
+        - Ignore history of any added git/hg/bzr repositories, just add the files
+        - Spin status icon on syncing changes made before startup
 
 
 0.6.0 for Linux and Mac (Sun Dec 25 2011):
diff --git a/SparkleShare/Mac/SparkleShare.csproj b/SparkleShare/Mac/SparkleShare.csproj
index 5e0f7cd6..fbf786bc 100755
--- a/SparkleShare/Mac/SparkleShare.csproj
+++ b/SparkleShare/Mac/SparkleShare.csproj
@@ -59,7 +59,7 @@
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="System.Net" />
-    <Reference Include="SparkleLib, Version=0.6.0.0, Culture=neutral, PublicKeyToken=null">
+    <Reference Include="SparkleLib, Version=0.8.0.0, Culture=neutral, PublicKeyToken=null">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\bin\SparkleLib.dll</HintPath>
     </Reference>
diff --git a/SparkleShare/SparkleControllerBase.cs b/SparkleShare/SparkleControllerBase.cs
index 28d813e2..a4d77628 100755
--- a/SparkleShare/SparkleControllerBase.cs
+++ b/SparkleShare/SparkleControllerBase.cs
@@ -245,7 +245,7 @@ namespace SparkleShare {
             if (name == null)
                 return GetLog ();
 
-            string path = new string [] {SparkleConfig.DefaultConfig.FoldersPath, name}.Combine ();
+            string path = Path.Combine (SparkleConfig.DefaultConfig.FoldersPath, name);
             int log_size = 50;
             
             foreach (SparkleRepoBase repo in Repositories) {
diff --git a/SparkleShare/SparkleEventLogController.cs b/SparkleShare/SparkleEventLogController.cs
index 99917216..457733ec 100755
--- a/SparkleShare/SparkleEventLogController.cs
+++ b/SparkleShare/SparkleEventLogController.cs
@@ -84,10 +84,12 @@ namespace SparkleShare {
             get {
                 List<SparkleChangeSet> change_sets = Program.Controller.GetLog (this.selected_folder);
 
+                string html = Program.Controller.GetHTMLLog (change_sets);
+
                 if (UpdateSizeInfoEvent != null)
                     UpdateSizeInfoEvent (Size, HistorySize);
 
-                return Program.Controller.GetHTMLLog (change_sets);
+                return html;
             }
         }