diff --git a/CASA/CASA.changes b/CASA/CASA.changes
index fa778b3f..868f74d1 100644
--- a/CASA/CASA.changes
+++ b/CASA/CASA.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jan 23 14:50:58 MST 2007 - jnorman@novell.com
+
+- Bug 172730. Check the GNOME_KEYRING_SOCKET environment variable 
+  before displaying the gnome tab and setting. 
+
 -------------------------------------------------------------------
 Tue Jan 23 14:25:13 MST 2007 - jnorman@novell.com
 
diff --git a/CASA/adlib/GKEngine.cs b/CASA/adlib/GKEngine.cs
index e42b6729..c04505e8 100644
--- a/CASA/adlib/GKEngine.cs
+++ b/CASA/adlib/GKEngine.cs
@@ -297,6 +297,13 @@ namespace Novell.CASA.DataEngines
 
 	public static Boolean IsStoreAvailable()
         {
+
+	      string sIsSocketDefined = Environment.GetEnvironmentVariable("GNOME_KEYRING_SOCKET");
+	      if ((sIsSocketDefined == null) || (sIsSocketDefined.Length < 1))
+	      {
+		return false;
+	      }
+			
               try
               {
 		        System.Runtime.InteropServices.Marshal.PrelinkAll(typeof(GnomeKeyring));