From 61178ffecd611431579433f524ce8da1c438dd04 Mon Sep 17 00:00:00 2001 From: Jim Norman Date: Thu, 30 Mar 2006 15:42:33 +0000 Subject: [PATCH] --- CASA.changes | 4 ++++ c_gui/CasaMain.cs | 25 ++++++++++++++++++++++--- c_gui/CasaTray.cs | 2 +- c_gui/CommonGUI.cs | 2 +- c_gui/Firefox.cs | 7 +++++++ c_gui/GnomeKeyring.cs | 5 +++++ c_gui/KdeWallet.cs | 10 ++++++++-- c_gui/MiCasa.cs | 6 ++++++ c_gui/Mozilla.cs | 5 +++++ c_gui/Store.cs | 7 +++++++ 10 files changed, 66 insertions(+), 7 deletions(-) diff --git a/CASA.changes b/CASA.changes index f4229998..eb58b6c9 100644 --- a/CASA.changes +++ b/CASA.changes @@ -1,3 +1,7 @@ +------------------------------------------------------------------- +Thu Mar 30 8:40:35 MST 2006 - jnorman@novell.com +- Bug 157218. Clear views on secrets when GUI is locked + ------------------------------------------------------------------- Wed Mar 29 19:40:35 IST 2006 - lsreevatsa@novell.com diff --git a/c_gui/CasaMain.cs b/c_gui/CasaMain.cs index 4234c8b5..b4ae121d 100644 --- a/c_gui/CasaMain.cs +++ b/c_gui/CasaMain.cs @@ -959,7 +959,7 @@ namespace Novell.CASA.GUI Common.ShowHelpUrl("RefreshStore.htm"); } - internal void RefreshStores() + internal void RefreshStores() { if( Common.IS_MICASA ) objMiCasa.AggregateStore(); @@ -990,11 +990,29 @@ namespace Novell.CASA.GUI objKdeWallet.AggregateStore(); if( Common.IS_GNOMEKEYRING ) - objGnomeKeyring.AggregateStore(); - + objGnomeKeyring.AggregateStore(); } + + internal void ClearViewOnStores() + { + if( Common.IS_MICASA ) + objMiCasa.ClearViewOnStore(); + + if( Common.IS_FIREFOX ) + { + objFirefox.ClearViewOnStore(); + } + + if( Common.IS_MOZILLA ) + objMozilla.ClearViewOnStore(); + if( Common.IS_KDEWALLET ) + objKdeWallet.ClearViewOnStore(); + + if( Common.IS_GNOMEKEYRING ) + objGnomeKeyring.ClearViewOnStore(); + } /// /// ******************************************************************** @@ -1102,6 +1120,7 @@ namespace Novell.CASA.GUI internal void LockGUI() { + ClearViewOnStores(); notebookStores.Sensitive = false; mmiLockSecrets.Sensitive = false; mmiUnlockSecrets.Sensitive = true; diff --git a/c_gui/CasaTray.cs b/c_gui/CasaTray.cs index fb61b11d..e2f1fb14 100644 --- a/c_gui/CasaTray.cs +++ b/c_gui/CasaTray.cs @@ -81,7 +81,7 @@ namespace Novell.CASA.GUI //MessageBox.Show("File 'notify.ico' cannot be found", "Error"); //Console.WriteLine(e.ToString()); //Console.WriteLine("File 'notify.ico' cannot be found"); - Logger.DbgLog("GUI:CasaTray.Setup() EXCEPTION: \n"e.ToString()); + Logger.DbgLog("GUI:CasaTray.Setup() EXCEPTION: \n" + e.ToString()); Logger.DbgLog("GUI:CasaTray.Setup(): File 'notify.ico' cannot be found"); return; } diff --git a/c_gui/CommonGUI.cs b/c_gui/CommonGUI.cs index db8e8bdf..32c99af2 100644 --- a/c_gui/CommonGUI.cs +++ b/c_gui/CommonGUI.cs @@ -261,7 +261,7 @@ namespace Novell.CASA.GUI sk1.Close(); //ShowErrorMessage(e, "Reading registry " + KeyName.ToUpper()); //Console.Write(e.ToString()); - Logger.DbgLog("GUI:CommonGUI.WriteRegKey EXCEPTION: \n"e.ToString()); + Logger.DbgLog("GUI:CommonGUI.WriteRegKey EXCEPTION: \n" + e.ToString()); //return null; } } diff --git a/c_gui/Firefox.cs b/c_gui/Firefox.cs index 8457141a..fbc67483 100644 --- a/c_gui/Firefox.cs +++ b/c_gui/Firefox.cs @@ -142,6 +142,13 @@ public class Firefox : Store Logger.DbgLog("GUI:Firefox.AggregateStore() - END"); } + + public override void ClearViewOnStore() + { + tsSecretIDFirefox.Clear(); + tsNativeInfoFirefox.Clear(); + } + ///####################################################################### /// DISPLAY NATIVE INFO /// diff --git a/c_gui/GnomeKeyring.cs b/c_gui/GnomeKeyring.cs index 612ec0aa..80138723 100644 --- a/c_gui/GnomeKeyring.cs +++ b/c_gui/GnomeKeyring.cs @@ -169,6 +169,11 @@ public class GnomeKeyring : Store } + public override void ClearViewOnStore() + { + tsSecretIDGnomeKeyring.Clear(); + tsNativeInfoGnomeKeyring.Clear(); + } ///####################################################################### /// DISPLAY NATIVE INFO diff --git a/c_gui/KdeWallet.cs b/c_gui/KdeWallet.cs index 80ece6cd..332bf869 100644 --- a/c_gui/KdeWallet.cs +++ b/c_gui/KdeWallet.cs @@ -166,8 +166,14 @@ public class KdeWallet : Store Logger.DbgLog("GUI:KdeWallet.AggregateStore() - END"); } - - + + + public override void ClearViewOnStore() + { + tsSecretIDKdeWallet.Clear(); + tsNativeInfoKdeWallet.Clear(); + } + ///####################################################################### /// DISPLAY NATIVE INFO diff --git a/c_gui/MiCasa.cs b/c_gui/MiCasa.cs index 04c5f291..026a7a66 100644 --- a/c_gui/MiCasa.cs +++ b/c_gui/MiCasa.cs @@ -161,6 +161,12 @@ public class MiCasa : Store Logger.DbgLog("GUI:MiCasa.AggregateStore() - END"); } + + public override void ClearViewOnStore() + { + tsSecretIDMiCasa.Clear(); + tsNativeInfoMiCasa.Clear(); + } diff --git a/c_gui/Mozilla.cs b/c_gui/Mozilla.cs index 45bfe92e..088e7f26 100644 --- a/c_gui/Mozilla.cs +++ b/c_gui/Mozilla.cs @@ -31,6 +31,11 @@ public class Mozilla : Store public override void AggregateStore() { + } + + public override void ClearViewOnStore() + { + } public override void ViewKeyValues() diff --git a/c_gui/Store.cs b/c_gui/Store.cs index 5fd8b893..533de320 100644 --- a/c_gui/Store.cs +++ b/c_gui/Store.cs @@ -36,6 +36,13 @@ public abstract class Store /// public abstract void AggregateStore(); + ///####################################################################### + /// + /// Clears the TreeStore object for the + /// respective stores. + /// + public abstract void ClearViewOnStore(); + ///####################################################################### ///