diff --git a/c_gui/CasaMain.cs b/c_gui/CasaMain.cs index b292da06..6d5d417a 100644 --- a/c_gui/CasaMain.cs +++ b/c_gui/CasaMain.cs @@ -1161,8 +1161,8 @@ namespace Novell.CASA.GUI checkbuttonGnomeKeyring.Active=Common.IS_GNOMEKEYRING; checkbuttonKdeWallet.Active=Common.IS_KDEWALLET; - checkbuttonGnomeKeyring.Sensitive=Common.IS_KDEWALLET_AVAILABLE; - checkbuttonKdeWallet.Sensitive=Common.IS_GNOMEKEYRING_AVAILABLE; + checkbuttonKdeWallet.Sensitive=Common.IS_KDEWALLET_AVAILABLE; + checkbuttonGnomeKeyring.Sensitive=Common.IS_GNOMEKEYRING_AVAILABLE; if (Common.IS_WINDOWS) { diff --git a/c_gui/StorePolicyInterface.cs b/c_gui/StorePolicyInterface.cs index ad930f95..8acdcb2a 100644 --- a/c_gui/StorePolicyInterface.cs +++ b/c_gui/StorePolicyInterface.cs @@ -81,14 +81,14 @@ namespace Novell.CASA.GUI { while( enumerator.MoveNext() ) { - if( ((Novell.CASA.CASAPolicy.Store)(enumerator.Current)).StoreName.Equals(Common.STORENAME_KDEWALLET)) + if( ((Novell.CASA.CASAPolicy.Store)(enumerator.Current)).StoreName.Equals(Common.STORENAME_KDEWALLET) && Common.IS_KDEWALLET_AVAILABLE) { Common.IS_KDEWALLET = true; storeNameKwallet = ((Novell.CASA.CASAPolicy.Store)(enumerator.Current)).StoreName; storeIdKwallet[kWalletStoreCounter++] = ((Novell.CASA.CASAPolicy.Store)(enumerator.Current)).StoreId; Logger.DbgLog("GUI:StorePolicyInterface.Init() - miCASA policy = " + Common.IS_MICASA); } - else if(((Novell.CASA.CASAPolicy.Store)(enumerator.Current)).StoreName.Equals(Common.STORENAME_GNOMEKEYRING)) + else if(((Novell.CASA.CASAPolicy.Store)(enumerator.Current)).StoreName.Equals(Common.STORENAME_GNOMEKEYRING) && Common.IS_GNOMEKEYRING_AVAILABLE) { Common.IS_GNOMEKEYRING=true; storeNameGkeyring=((Novell.CASA.CASAPolicy.Store)(enumerator.Current)).StoreName;