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

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;
} }
} }

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;
} }
} }

View File

@ -1157,10 +1157,13 @@ namespace Novell.CASA.GUI
dialogPreferences.SetPosition(Gtk.WindowPosition.CenterOnParent); dialogPreferences.SetPosition(Gtk.WindowPosition.CenterOnParent);
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)
{ {
checkbuttonGnomeKeyring.Sensitive = false; checkbuttonGnomeKeyring.Sensitive = false;

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_MICASA = true,
IS_FIREFOX = false,
IS_MOZILLA = false,
IS_KDEWALLET = false,
IS_GNOMEKEYRING = false;
public static bool IS_LINUX = false, public static bool IS_LINUX = false,
IS_WINDOWS = false; IS_WINDOWS = false;
public static string GladeFile = null, public static string GladeFile = null,
DebugLogFile = null; DebugLogFile = null;
///############################################################## ///##############################################################
@ -108,11 +114,11 @@ public class Common
///############################################################# ///#############################################################
///CasaIcons path ///CasaIcons path
#if W32 #if W32
public static string CASAICONS = "../images/CASAicons.ico"; public static string CASAICONS = "../images/CASAicons.ico";
#endif #endif
#if LINUX #if LINUX
public static string CASAICONS = "/usr/share/doc/packages/CASA/images/CASAicons.ico"; public static string CASAICONS = "/usr/share/doc/packages/CASA/images/CASAicons.ico";
#endif #endif
///############################################################## ///##############################################################
@ -308,40 +314,40 @@ public class Common
} }
public static bool ShowUrl(string url) public static bool ShowUrl(string url)
{ {
Process urlShowProcess = new Process(); Process urlShowProcess = new Process();
if (Common.IS_LINUX) if (Common.IS_LINUX)
{ {
String sCurrentDesktop = Environment.GetEnvironmentVariable("WINDOWMANAGER"); String sCurrentDesktop = Environment.GetEnvironmentVariable("WINDOWMANAGER");
if (sCurrentDesktop != null && (sCurrentDesktop.IndexOf("kde") > 0)) if (sCurrentDesktop != null && (sCurrentDesktop.IndexOf("kde") > 0))
urlShowProcess.StartInfo.FileName = "kde-open"; urlShowProcess.StartInfo.FileName = "kde-open";
else else
urlShowProcess.StartInfo.FileName = "gnome-open"; urlShowProcess.StartInfo.FileName = "gnome-open";
urlShowProcess.StartInfo.Arguments = url; urlShowProcess.StartInfo.Arguments = url;
} }
else else
urlShowProcess.StartInfo.FileName = url; urlShowProcess.StartInfo.FileName = url;
try try
{ {
urlShowProcess.Start(); urlShowProcess.Start();
urlShowProcess.WaitForExit(); urlShowProcess.WaitForExit();
} }
catch (Exception e) catch (Exception e)
{ {
Logger.DbgLog(e.Message); Logger.DbgLog(e.Message);
Logger.DbgLog(e.StackTrace); Logger.DbgLog(e.StackTrace);
return false; return false;
} }
if (urlShowProcess.ExitCode == 0) if (urlShowProcess.ExitCode == 0)
return true; return true;
else else
return false; return false;
} }
} }

View File

@ -65,6 +65,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 )
@ -72,20 +75,20 @@ namespace Novell.CASA.GUI {
Logger.DbgLog("GUI:StorePolicyInterface.Init() - No Aggregation Policy Found."); Logger.DbgLog("GUI:StorePolicyInterface.Init() - No Aggregation Policy Found.");
return( Common.STATUS_POLICY_POLICYNOTFOUND ); return( Common.STATUS_POLICY_POLICYNOTFOUND );
} }
ArrayList stores = aggPol.StoreList; ArrayList stores = aggPol.StoreList;
IEnumerator enumerator = stores.GetEnumerator(); IEnumerator enumerator = stores.GetEnumerator();
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;

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