From 5f20ae6c228b93a102ebde0b9bbc8de2bb1b0a51 Mon Sep 17 00:00:00 2001 From: Jim Norman Date: Tue, 19 Sep 2006 14:45:36 +0000 Subject: [PATCH] Removed feature recently added. --- CASA/gui/CasaMain.cs | 15 ++++---- CASA/gui/images/casa.glade | 70 -------------------------------------- 2 files changed, 6 insertions(+), 79 deletions(-) diff --git a/CASA/gui/CasaMain.cs b/CASA/gui/CasaMain.cs index ae8b6598..947779a1 100644 --- a/CASA/gui/CasaMain.cs +++ b/CASA/gui/CasaMain.cs @@ -103,8 +103,8 @@ namespace Novell.CASA.GUI checkbuttonKdeWallet, checkbuttonCloseMessage, checkbuttonRunInTray, - checkbuttonSaveSecrets, - checkbuttonDecrypt; + checkbuttonSaveSecrets; + [Glade.Widget] Gtk.Label label88, @@ -1650,8 +1650,7 @@ namespace Novell.CASA.GUI radiobutton1.Active = config.GetConfigSetting(Common.CONFIG_DISPLAY_CASA_MANAGER, true); radiobutton2.Active = !config.GetConfigSetting(Common.CONFIG_DISPLAY_CASA_MANAGER, true); - - checkbuttonDecrypt.Active = config.GetConfigSetting(Common.CONFIG_DECRYPT_USING_DESKTOP_PASS, true); + checkbuttonSaveSecrets.Active = config.GetConfigSetting(Common.CONFIG_PERSIST_SECRETS, true); if (Common.IS_WINDOWS) @@ -1717,14 +1716,12 @@ namespace Novell.CASA.GUI if (checkbuttonSaveSecrets.Active) { entryStorageDirectory.Sensitive = true; - buttonChooseDirectory.Sensitive = true; - checkbuttonDecrypt.Sensitive = true; + buttonChooseDirectory.Sensitive = true; } else { entryStorageDirectory.Sensitive = false; - buttonChooseDirectory.Sensitive = false; - checkbuttonDecrypt.Sensitive = false; + buttonChooseDirectory.Sensitive = false; } } @@ -1808,7 +1805,7 @@ namespace Novell.CASA.GUI // update persistent policy settings config.SetConfigSetting(Common.CONFIG_PERSIST_SECRETS, checkbuttonSaveSecrets.Active); - config.SetConfigSetting(Common.CONFIG_DECRYPT_USING_DESKTOP_PASS, checkbuttonDecrypt.Active); + // delete .miCASA file if not peristing if (!checkbuttonSaveSecrets.Active) diff --git a/CASA/gui/images/casa.glade b/CASA/gui/images/casa.glade index c0a12884..c06c764f 100644 --- a/CASA/gui/images/casa.glade +++ b/CASA/gui/images/casa.glade @@ -4528,76 +4528,6 @@ prompted for the Master Password at startup. - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 0 - - - - True - True - Decypt and open miCASA using my workstation password - True - GTK_RELIEF_NORMAL - True - True - False - True - - - 0 - False - False - - - - - 0 - True - True - - - - - 0 - True - True - - - True