geos_one/CASA
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Browse Source
This commit is contained in:
smanojna 2006-02-14 12:46:09 +00:00
parent e6b7e92fc5
commit 7ea0c756ca
6 changed files with 78 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
c_adlib/GKEngine.cs
View File

@ -297,20 +297,17 @@ namespace Novell.CASA.DataEngines
{ {
try try
{ {
System.Runtime.InteropServices.Marshal.PrelinkAll(typeof(GnomeKeyring)); System.Runtime.InteropServices.Marshal.PrelinkAll(typeof(GnomeKeyring));
//if (GnomeKeyring.IsGnomeKeyringInstalled())
return true; return true;
//else
// return false;
} }
catch(DllNotFoundException d) catch(DllNotFoundException d)
{ {
Console.WriteLine("Store Not Available Exception = " + d.ToString()); //Console.WriteLine("Store Not Available Exception = " + d.ToString());
return false; return false;
} }
catch(Exception e) catch(Exception e)
{ {
Console.WriteLine("Store Not Available Exception = " + e.ToString()); //Console.WriteLine("Store Not Available Exception = " + e.ToString());
return false; return false;
} }
} }

4
c_adlib/KWalletEngine.cs
View File

@ -462,12 +462,12 @@ namespace Novell.CASA.DataEngines
} }
catch(DllNotFoundException d) catch(DllNotFoundException d)
{ {
Console.WriteLine("Store Not Available Exception =" + d.ToString()); //Console.WriteLine("Store Not Available Exception =" + d.ToString());
return false; return false;
} }
catch(Exception e) catch(Exception e)
{ {
Console.WriteLine("Store Not Available Exception =" + e.ToString()); //Console.WriteLine("Store Not Available Exception =" + e.ToString());
return false; return false;
} }
} }

7
c_gui/CasaMain.cs
View File

@ -1158,8 +1158,11 @@ namespace Novell.CASA.GUI
dialogPreferences.TransientFor = windowMain; dialogPreferences.TransientFor = windowMain;
checkbuttonFirefox.Active=Common.IS_FIREFOX; checkbuttonFirefox.Active=Common.IS_FIREFOX;
checkbuttonMozilla.Active=Common.IS_MOZILLA; checkbuttonMozilla.Active=Common.IS_MOZILLA;
checkbuttonGnomeKeyring.Active=checkbuttonGnomeKeyring.Sensitive=Common.IS_GNOMEKEYRING; checkbuttonGnomeKeyring.Active=Common.IS_GNOMEKEYRING;
checkbuttonKdeWallet.Active=checkbuttonKdeWallet.Sensitive=Common.IS_KDEWALLET; checkbuttonKdeWallet.Active=Common.IS_KDEWALLET;
checkbuttonGnomeKeyring.Sensitive=Common.IS_KDEWALLET_AVAILABLE;
checkbuttonKdeWallet.Sensitive=Common.IS_GNOMEKEYRING_AVAILABLE;
if (Common.IS_WINDOWS) if (Common.IS_WINDOWS)
{ {

32
c_gui/Common.cs
View File

@ -36,22 +36,28 @@ public class Common
{ {
public const int STORE_MICASA = 0, public const int STORE_MICASA = 0,
STORE_FIREFOX = 1, STORE_FIREFOX = 1,
STORE_MOZILLA = 2, STORE_MOZILLA = 2,
STORE_KDEWALLET = 3, STORE_KDEWALLET = 3,
STORE_GNOMEKEYRING = 4; STORE_GNOMEKEYRING = 4;
public static bool IS_MICASA = true, public static bool IS_MICASA_AVAILABLE = true,
IS_FIREFOX = false, IS_FIREFOX_AVAILABLE = false,
IS_MOZILLA = false, IS_MOZILLA_AVAILABLE = false,
IS_KDEWALLET = false, IS_KDEWALLET_AVAILABLE = false,
IS_GNOMEKEYRING = false; IS_GNOMEKEYRING_AVAILABLE = false;
public static bool IS_LINUX = false, public static bool IS_MICASA = true,
IS_WINDOWS = false; IS_FIREFOX = false,
IS_MOZILLA = false,
IS_KDEWALLET = false,
IS_GNOMEKEYRING = false;
public static string GladeFile = null, public static bool IS_LINUX = false,
DebugLogFile = null; IS_WINDOWS = false;
public static string GladeFile = null,
DebugLogFile = null;
///############################################################## ///##############################################################

7
c_gui/StorePolicyInterface.cs
View File

@ -66,6 +66,9 @@ namespace Novell.CASA.GUI {
try try
{ {
Common.IS_KDEWALLET_AVAILABLE = AD.IsStoreAvailable(Common.STORE_KDEWALLET);
Common.IS_GNOMEKEYRING_AVAILABLE = AD.IsStoreAvailable(Common.STORE_GNOMEKEYRING);
aggPol = (AggregationPol) ICASAPol.GetPolicy(CASAPolType.AGGREGATION_POL); aggPol = (AggregationPol) ICASAPol.GetPolicy(CASAPolType.AGGREGATION_POL);
if( null == aggPol ) if( null == aggPol )
{ {
@ -78,14 +81,14 @@ namespace Novell.CASA.GUI {
while( enumerator.MoveNext() ) while( enumerator.MoveNext() )
{ {
if( ((Novell.CASA.CASAPolicy.Store)(enumerator.Current)).StoreName.Equals(Common.STORENAME_KDEWALLET) && true == AD.IsStoreAvailable(Common.STORE_KDEWALLET)) if( ((Novell.CASA.CASAPolicy.Store)(enumerator.Current)).StoreName.Equals(Common.STORENAME_KDEWALLET))
{ {
Common.IS_KDEWALLET = true; Common.IS_KDEWALLET = true;
storeNameKwallet = ((Novell.CASA.CASAPolicy.Store)(enumerator.Current)).StoreName; storeNameKwallet = ((Novell.CASA.CASAPolicy.Store)(enumerator.Current)).StoreName;
storeIdKwallet[kWalletStoreCounter++] = ((Novell.CASA.CASAPolicy.Store)(enumerator.Current)).StoreId; storeIdKwallet[kWalletStoreCounter++] = ((Novell.CASA.CASAPolicy.Store)(enumerator.Current)).StoreId;
Logger.DbgLog("GUI:StorePolicyInterface.Init() - miCASA policy = " + Common.IS_MICASA); Logger.DbgLog("GUI:StorePolicyInterface.Init() - miCASA policy = " + Common.IS_MICASA);
} }
else if(((Novell.CASA.CASAPolicy.Store)(enumerator.Current)).StoreName.Equals(Common.STORENAME_GNOMEKEYRING) && true == AD.IsStoreAvailable(Common.STORE_GNOMEKEYRING)) else if(((Novell.CASA.CASAPolicy.Store)(enumerator.Current)).StoreName.Equals(Common.STORENAME_GNOMEKEYRING))
{ {
Common.IS_GNOMEKEYRING=true; Common.IS_GNOMEKEYRING=true;
storeNameGkeyring=((Novell.CASA.CASAPolicy.Store)(enumerator.Current)).StoreName; storeNameGkeyring=((Novell.CASA.CASAPolicy.Store)(enumerator.Current)).StoreName;

2
shsrc/lshsrc/CASA.spec
View File

@ -53,7 +53,7 @@ for credential storage and single sign-on.
%package gui %package gui
Summary: The CASA Console Utility Summary: The CASA Console Utility
Group: Productivity/Other Group: Productivity/Other
Requires: CASA = %{version} gtk-sharp >= 1.0.9 gnome-keyring >= 0.2.1 kdelibs3 >= 3.2.1 gtk2 >= 2.4.14 Requires: CASA = %{version} gtk-sharp >= 1.0.9 gtk2 >= 2.4.14
Provides: CASA-gui Provides: CASA-gui
%description gui %description gui