From 3a2c82ff277b2ca7ecbd353347d8a8bf14be7d93 Mon Sep 17 00:00:00 2001
From: Hylke Bons <hylkebons@gmail.com>
Date: Sat, 20 Nov 2010 11:42:38 +0000
Subject: [PATCH] [statusicon] Remove dependancy on SparkleLib

---
 SparkleShare/SparkleController.cs | 35 +++++++++++++++++--------------
 SparkleShare/SparkleStatusIcon.cs | 27 +++++++++---------------
 2 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs
index be36fc28..7ee72db9 100644
--- a/SparkleShare/SparkleController.cs
+++ b/SparkleShare/SparkleController.cs
@@ -56,9 +56,6 @@ namespace SparkleShare {
 		public event OnErrorEventHandler OnError;
 		public delegate void OnErrorEventHandler ();
 
-		public event OnFirstRunEventHandler OnFirstRun;
-		public delegate void OnFirstRunEventHandler ();
-
 		public event OnInvitationEventHandler OnInvitation;
 		public delegate void OnInvitationEventHandler (string invitation_file_path);
 
@@ -137,6 +134,23 @@ namespace SparkleShare {
 			thread.Start ();
 
 		}
+
+		
+		public List <string> Folders
+		{
+			
+			get
+			{
+				List <string> folders = new List <string> ();
+				
+				foreach (SparkleRepo repo in Repositories)
+					folders.Add (repo.LocalPath);
+
+				return folders;
+				
+			}
+			
+		}
 		
 		
 		// Creates a folder in the user's home folder to store configuration
@@ -668,17 +682,8 @@ namespace SparkleShare {
 				target_folder_name += " (" + i + ")";
 
 
-			fetcher.CloningStarted += delegate {
-				
-				SparkleHelpers.DebugInfo ("Git", "[" + canonical_name + "] Cloning Repository");
-
-			};
-
-
 			fetcher.CloningFinished += delegate {
 
-				SparkleHelpers.DebugInfo ("Git", "[" + canonical_name + "] Repository cloned");
-
 				SparkleHelpers.ClearAttributes (tmp_folder);
 
 				try {
@@ -690,7 +695,7 @@ namespace SparkleShare {
 
 				} catch (Exception e) {
 
-					SparkleHelpers.DebugInfo ("Git", "[" + name + "] Error moving folder: " + e.Message);
+					SparkleHelpers.DebugInfo ("Controller", "Error moving folder: " + e.Message);
 
 				}
 
@@ -706,14 +711,12 @@ namespace SparkleShare {
 
 			fetcher.CloningFailed += delegate {
 
-				SparkleHelpers.DebugInfo ("Git", "[" + canonical_name + "] Cloning failed");
-
 				if (Directory.Exists (tmp_folder)) {
 
 					SparkleHelpers.ClearAttributes (tmp_folder);
 					Directory.Delete (tmp_folder, true);
 
-					SparkleHelpers.DebugInfo ("Config", "[" + name + "] Deleted temporary directory");
+					SparkleHelpers.DebugInfo ("Config", "Deleted temporary directory: " + tmp_folder);
 
 				}
 
diff --git a/SparkleShare/SparkleStatusIcon.cs b/SparkleShare/SparkleStatusIcon.cs
index 17b0c53c..0a800501 100644
--- a/SparkleShare/SparkleStatusIcon.cs
+++ b/SparkleShare/SparkleStatusIcon.cs
@@ -16,11 +16,7 @@
 
 using Gtk;
 using Mono.Unix;
-using SparkleLib;
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
 using System.Timers;
 
 namespace SparkleShare {
@@ -162,30 +158,27 @@ namespace SparkleShare {
 			Menu.Add (new SeparatorMenuItem ());
 			Menu.Add (folder_action.CreateMenuItem ());
 
-				if (SparkleShare.Controller.Repositories.Count > 0) {
-
+				if (SparkleShare.Controller.Folders.Count > 0) {
+			
 					// Creates a menu item for each repository with a link to their logs
-					foreach (SparkleRepo repo in SparkleShare.Controller.Repositories) {
+					foreach (string path in SparkleShare.Controller.Folders) {
 
-						folder_action = new Gtk.Action ("", repo.Name) {
+						folder_action = new Gtk.Action ("", path) {
 							IconName    = "folder",
 							IsImportant = true
 						};
 
-						if (repo.HasUnsyncedChanges)
-							folder_action.IconName = "dialog-error";
+//						if (repo.HasUnsyncedChanges)
+//							folder_action.IconName = "dialog-error";
 
-						folder_action.Activated += OpenEventLogDelegate (repo.LocalPath);
+						folder_action.Activated += OpenEventLogDelegate (path);
 
 						MenuItem menu_item = (MenuItem) folder_action.CreateMenuItem ();
 
-						if (repo.Description != null)
-							menu_item.TooltipText = repo.Description;
-
 						Menu.Add (menu_item);
-
+				
 					}
-
+				
 				} else {
 
 					MenuItem no_folders_item = new MenuItem (_("No Remote Folders Yet")) {
@@ -337,7 +330,7 @@ namespace SparkleShare {
 
 			Animation.Stop ();
 
-			if (SparkleShare.Controller.Repositories.Count == 0) {
+			if (SparkleShare.Controller.Folders.Count == 0) {
 
 				StateText = _("No folders yet");
 				Application.Invoke (delegate {