From 7c6284b5cff5996caea4d9cd60487c36cf338340 Mon Sep 17 00:00:00 2001
From: Hylke Bons <hylkebons@gmail.com>
Date: Tue, 5 Oct 2010 22:22:31 +0100
Subject: [PATCH] [log] destroy logs properly after closing, so they don't pop
 up again on raised events

---
 SparkleShare/SparkleLog.cs        |   2 +-
 SparkleShare/SparkleStatusIcon.cs |  25 ++++++++++++++++---------
 SparkleShare/SparkleUI.cs         |   2 +-
 data/icons/Makefile.am            |   3 ++-
 data/icons/dialog-warning.png     | Bin 0 -> 683 bytes
 5 files changed, 20 insertions(+), 12 deletions(-)
 create mode 100644 data/icons/dialog-warning.png

diff --git a/SparkleShare/SparkleLog.cs b/SparkleShare/SparkleLog.cs
index 9b465120..fe455cf5 100644
--- a/SparkleShare/SparkleLog.cs
+++ b/SparkleShare/SparkleLog.cs
@@ -154,7 +154,7 @@ namespace SparkleShare {
 
 			}
 
-			HideAll (); // TODO: destroy it
+			HideAll ();
 
 		}
 
diff --git a/SparkleShare/SparkleStatusIcon.cs b/SparkleShare/SparkleStatusIcon.cs
index 815455ed..d12f02b6 100644
--- a/SparkleShare/SparkleStatusIcon.cs
+++ b/SparkleShare/SparkleStatusIcon.cs
@@ -30,8 +30,6 @@ namespace SparkleShare {
 	public class SparkleStatusIcon : StatusIcon
 	{
 
-		private List <SparkleLog> OpenLogs;
-
 		private Menu Menu;
 		private MenuItem StatusMenuItem;
 		private string StateText;
@@ -52,7 +50,7 @@ namespace SparkleShare {
 		public SparkleStatusIcon () : base ()
 		{
 
-			OpenLogs = new List <SparkleLog> ();
+			SparkleUI.OpenLogs = new List <SparkleLog> ();
 
 			FolderSize = GetFolderSize (new DirectoryInfo (SparklePaths.SparklePath));
 
@@ -129,7 +127,7 @@ namespace SparkleShare {
 
 			return delegate { 
 
-				SparkleLog log = OpenLogs.Find (delegate (SparkleLog l) { return l.LocalPath.Equals (path); });
+				SparkleLog log = SparkleUI.OpenLogs.Find (delegate (SparkleLog l) { return l.LocalPath.Equals (path); });
 
 				// Check whether the log is already open,
 				// create a new one if that's not the case or
@@ -139,11 +137,13 @@ namespace SparkleShare {
 					log = new SparkleLog (path);
 
 					log.Hidden += delegate {
-						OpenLogs.Remove (log);
-						log = null;
+
+						SparkleUI.OpenLogs.Remove (log);
+						log.Destroy ();
+
 					};
 
-					OpenLogs.Add (log);
+					SparkleUI.OpenLogs.Add (log);
 
 				}
 
@@ -227,8 +227,10 @@ namespace SparkleShare {
 		// Creates the menu that is popped up when the
 		// user clicks the statusicon
 		public void CreateMenu ()
-		{
-
+		{int i = 0;
+foreach (SparkleLog logi in SparkleUI.OpenLogs){i++;
+Console.WriteLine (i + ": " + logi.LocalPath);
+}
 				Menu = new Menu ();
 
 					// The menu item showing the status and size of the SparkleShare folder
@@ -267,6 +269,10 @@ namespace SparkleShare {
 							IsImportant = true
 						};
 
+						if (repo.HasUnsyncedChanges){
+							folder_action.IconName = "dialog-warning";
+							Console.WriteLine ("FFFFFFFFFFFFFFFFFFFF");
+}
 						folder_action.Activated += OpenLogDelegate (repo.LocalPath);
 
 						MenuItem menu_item = (MenuItem) folder_action.CreateMenuItem ();
@@ -354,6 +360,7 @@ namespace SparkleShare {
 		private void ShowMenu (object o, EventArgs args)
 		{
 
+			CreateMenu ();
 			Menu.ShowAll ();
 			Menu.Popup (null, null, SetPosition, 0, Global.CurrentEventTime);
 
diff --git a/SparkleShare/SparkleUI.cs b/SparkleShare/SparkleUI.cs
index c78495aa..be60b0d0 100644
--- a/SparkleShare/SparkleUI.cs
+++ b/SparkleShare/SparkleUI.cs
@@ -32,7 +32,7 @@ namespace SparkleShare {
 		
 		public static List <SparkleRepo> Repositories;
 		public static SparkleStatusIcon StatusIcon;
-
+		public static List <SparkleLog> OpenLogs;
 
 		// Short alias for the translations
 		public static string _(string s)
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 7618c2ad..88e72484 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -28,7 +28,8 @@ app_theme_icons =					\
 	status,document-added-16.png			\
 	status,document-edited-16.png			\
 	status,document-moved-16.png			\
-	status,document-removed-16.png
+	status,document-removed-16.png			\
+	status,dialog-warning-16.png
 
 install_icon_exec = $(top_srcdir)/build/icon-theme-installer \
 	-t "$(theme)" \
diff --git a/data/icons/dialog-warning.png b/data/icons/dialog-warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..219432c44d6d57179930a1f307e3c48e89afc4ab
GIT binary patch
literal 683
zcmV;c0#yBpP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10w_sDK~y-6jnlnrQ&Ako@$c`Pb90lM<fchuO41i;v1$6EbrL}f
zf*{n%$)z1d7jY1aRf^KZm!;}Z5qCG2*1tgzac~lpLZMVzx@b+4G|A09E-F+L>9ZU-
zJm)h#N36B9OZl!8l{jy(t%?rAOVLMmqg_w6eGMq>y)vcgVLftjGBlAF9eeFAD|h6A
zE}R^fL{3yPr&Mn2T<x};IvgM(5=||u{6tJ*8N^K?`QuR=i9J6Qus6?T$xjv#h3Xwg
z6-tP5M0!R?f6UAD|A9p@4U>8*$-E~ff=U-q*&#3n`~fdev1JxTbp*C|xhmOVUs`ok
zzR29t3Uf;<=zIxfo7nVFZtFWUZGo+8;x%;gK_u#V;(Dmm5wgBRt}BAd^db=#H}1!q
z5?flkA?`mwMYt95bB+$G=>9QmP@|A`C}bRLYaiV|foat+iSC#*xqblnbVV{P9i2<K
zc#_N@aUX&zN3#w?JuU=Q#P3FoCc$pJ(c<3PtoVO`rscltxkiUI^wBYBR-j&Hs^oEc
zP{ZCPRKBA7i<qE{>tL!53jp$NhCXHZJksZSZf_Ci#QEQYK%adAK<n*Iuoi4c<HIWT
zt#!U^Q&l0yOaPB_F&q=t(fL8b{ar*9h+^~gEFjqW9$>LHL=TMO?5xw}p?AtWG(o^r
zGKvGxc)xmJ7U^GS{qOYvaThoE#u-y@^77*b3)bSc>2-_<`yxD(PT%>k`3YlFonmk<
R;ST@+002ovPDHLkV1l9fDaHT*

literal 0
HcmV?d00001