From 44bc52b03badedf640f5f056d8cd95467fe73bec Mon Sep 17 00:00:00 2001
From: Hylke Bons <hylkebons@gmail.com>
Date: Sat, 12 Jun 2010 17:21:03 +0100
Subject: [PATCH] don't scatter syncing state string changes all over the place

---
 SparkleShare/SparkleStatusIcon.cs | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/SparkleShare/SparkleStatusIcon.cs b/SparkleShare/SparkleStatusIcon.cs
index 824f7a5d..a835c770 100644
--- a/SparkleShare/SparkleStatusIcon.cs
+++ b/SparkleShare/SparkleStatusIcon.cs
@@ -27,7 +27,7 @@ namespace SparkleShare {
 	public class SparkleStatusIcon : StatusIcon {
 
 		private Timer Timer;
-		private string StateText;
+		private int SyncingState;
 
 		// Short alias for the translations
 		public static string _ (string s) {
@@ -45,7 +45,12 @@ namespace SparkleShare {
 
 			Timer = new Timer ();
 			Activate += ShowMenu;
-			StateText = _("Everything is up to date");
+
+			//  0 = Everything up to date
+			//  1 = Syncing in progress
+			// -1 = Error syncing
+			SyncingState = 0;
+
 			SetIdleState ();
 
 		}
@@ -54,6 +59,19 @@ namespace SparkleShare {
 
 				Menu Menu = new Menu ();
 
+				string StateText = "";
+				switch (SyncingState) {
+					case -1:
+						StateText = _("Error syncing");
+						break;
+					case 0:
+						StateText = _("Everything is up to date");
+						break;
+					case 1:
+						StateText = _("Syncing…");
+						break;
+				}
+
 				MenuItem StatusMenuItem = new MenuItem (StateText);
 				StatusMenuItem.Sensitive = false;
 
@@ -146,15 +164,15 @@ namespace SparkleShare {
 		public void SetIdleState () {
 			Timer.Stop ();
 			Pixbuf = SparkleHelpers.GetIcon ("folder-sparkleshare", 24);
-			StateText = _("Everything is up to date");
+			SyncingState = 0;
 		}
 
-		// Changes the status icon to the suncing antimation
+		// Changes the status icon to the syncing animation
 		// TODO: There are UI freezes when switching back and forth
 		// bewteen syncing and idle state
 		public void SetSyncingState () {
 
-			StateText = _("Syncing…");
+			SyncingState = 1;
 
 			int CycleDuration = 250;
 			int CurrentStep = 0;
@@ -195,7 +213,7 @@ namespace SparkleShare {
 		// Changes the status icon to the error icon
 		public void SetErrorState () {
 			IconName = "folder-sync-error";
-			StateText = _("Error syncing");
+			SyncingState = -1;
 		}
 
 		public void SetPosition (Menu menu, out int x, out int y,