diff --git a/c_sharp/GladeSharp2/AssemblyInfo.cs b/c_sharp/GladeSharp2/AssemblyInfo.cs
deleted file mode 100644
index 177a4f0e..00000000
--- a/c_sharp/GladeSharp2/AssemblyInfo.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-//
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-//
-[assembly: AssemblyTitle("")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]		
-
-//
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers 
-// by using the '*' as shown below:
-
-[assembly: AssemblyVersion("1.0.*")]
-
-//
-// In order to sign your assembly you must specify a key to use. Refer to the 
-// Microsoft .NET Framework documentation for more information on assembly signing.
-//
-// Use the attributes below to control which key is used for signing. 
-//
-// Notes: 
-//   (*) If no key is specified, the assembly is not signed.
-//   (*) KeyName refers to a key that has been installed in the Crypto Service
-//       Provider (CSP) on your machine. KeyFile refers to a file which contains
-//       a key.
-//   (*) If the KeyFile and the KeyName values are both specified, the 
-//       following processing occurs:
-//       (1) If the KeyName can be found in the CSP, that key is used.
-//       (2) If the KeyName does not exist and the KeyFile does exist, the key 
-//           in the KeyFile is installed into the CSP and used.
-//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
-//       When specifying the KeyFile, the location of the KeyFile should be
-//       relative to the project output directory which is
-//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is
-//       located in the project directory, you would specify the AssemblyKeyFile 
-//       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
-//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
-//       documentation for more information on this.
-//
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("")]
-[assembly: AssemblyKeyName("")]
diff --git a/c_sharp/GladeSharp2/Bitmap.bmp b/c_sharp/GladeSharp2/Bitmap.bmp
deleted file mode 100644
index e439f685..00000000
Binary files a/c_sharp/GladeSharp2/Bitmap.bmp and /dev/null differ
diff --git a/c_sharp/GladeSharp2/Driver.cs b/c_sharp/GladeSharp2/Driver.cs
deleted file mode 100644
index d94ac573..00000000
--- a/c_sharp/GladeSharp2/Driver.cs
+++ /dev/null
@@ -1,786 +0,0 @@
-using System;
-using System.Text;
-using System.Collections.Specialized;
-using Gtk;
-using Glade;
-
-using Novell.CASA;
-using Novell.SecretStore.NSSSWrapper;
-
-namespace GladeSharp2
-{
-	/// <summary>
-	/// Summary description for Driver.
-	/// </summary>
-	class Driver
-	{
-		#region Glade Widgets
-	
-		[Widget] Gtk.Window window1;
-		[Widget] Gtk.TreeView treeview1;	
-			
-		[Widget] Gtk.Window addSecretWindow;
-		[Widget] Gtk.Window displaySecretWindow;
-		
-		[Widget] Gtk.Entry entrySecretID;
-		[Widget] Gtk.Entry entryUsername;
-		[Widget] Gtk.Entry entryPassword;
-		[Widget] Gtk.Entry entryNDAP;
-		[Widget] Gtk.Entry entryLDAP;
-		[Widget] Gtk.Entry entryEMAIL;
-
-		[Widget] Gtk.Entry entryLoginUser;
-		[Widget] Gtk.Entry entryLoginPassword;
-		[Widget] Gtk.Entry entryLoginServer;
-
-		[Widget] Gtk.Label label11;
-		[Widget] Gtk.Label label22;
-
-		[Widget] Gtk.Label labelCreated;
-		[Widget] Gtk.Label labelAccessed;
-		[Widget] Gtk.Label labelModified;
-
-		[Widget] Gtk.TreeView listActivity;
-		[Widget] Gtk.TreeView tvKeyValue;
-		[Widget] Gtk.Statusbar statusbar1;
-		[Widget] Gtk.Image image1;
-
-		[Widget] Gtk.Entry entryHost;
-		[Widget] Gtk.Entry entryHostPort;
-
-		[Widget] Gtk.Entry entryServerPort;
-		[Widget] Gtk.Label labelServerStatus;
-
-		#endregion
-		
-		
-		Novell.CASA.SecretStore ss = Novell.CASA.SecretStore.getInstance();
-
-		private RemoteStore m_rs = null;
-		private bool b_isAuthenticated = false;
-
-		//private RemoteServer m_remoteServer = null;
-
-		TreeStore tsActivityStore;
-		TreeIter tIter = new TreeIter();
-
-		// used for secret list
-		TreeStore store;
-		TreeIter secretIter = new TreeIter();
-
-		private static string SHS_PASSWORD	= "Password";
-		private static string SHS_USERNAME	= "Username";
-		private static string SHS_OTHER		= "Other";
-		private static string SHS_BINARY	= "Binary";
-		private static string SHS_CN		= "CN";
-		private static string SHS_DN_LDAP	= "DN_LDAP";
-		private static string SHS_DN_NDAP	= "DN_NDAP";
-		private static string SHS_EMAIL		= "EMAIL";
-	
-		private DateTime date1970 = new DateTime(1970, 1, 1);
-		
-
-		/// <summary>
-		/// The main entry point for the application.
-		/// </summary>
-		[STAThread]
-		static void Main(string[] args) 
-		{
-			new Driver(args);
-		}
-
-
-		public Driver(string[] args) 
-		{
-		    Application.Init();
-
-		    Glade.XML gxml = new Glade.XML (null, "gladesharp1.glade", "window1", null);			
-		    gxml.Autoconnect (this);
-
-			treeview1.AppendColumn ("Secrets", new CellRendererText (), "text", 0);
-			store = new TreeStore (typeof (string));
-			store.SetSortColumnId(0, Gtk.SortType.Ascending);
-			treeview1.Model = store;
-			
-			
-
-			listActivity.AppendColumn("Demo", new CellRendererText (), "text", 0);
-			tsActivityStore = new TreeStore (typeof (string));
-			listActivity.Model = tsActivityStore;
-
-			logActivity("SecretStore Started");
-			//image1.Pixbuf = new Gdk.Pixbuf (null, "./Bitmap.bmp");
-			//image1.Pixbuf = "c:/Bitmap.bmp";
-			showSecrets();
-
-			// set Network login id
-			entryLoginUser.Text = "cn="+getNetworkUserID()+",o=novell";
-
-			// get config
-			//System.Configuration.ConfigurationSettings.AppSettings.Set("Jim", "Jim Value");
-
-
-		    Application.Run();
-		}
-
-
-		private void logActivity(string message)
-		{
-			tsActivityStore.Append (out tIter);
-			tsActivityStore.SetValue (tIter, 0, "[" + DateTime.Now.ToShortTimeString() + "] "+ message);
-		}
-		// Connect the Signals defined in Glade
-		public void on_window1_delete_event (object o, DeleteEventArgs args) 
-		{
-		    Application.Quit();
-		    args.RetVal = true;
-		}        
-		
-		
-		#region Button Click Event handlers
-
-		protected void on_toolbutton1_clicked(object o, EventArgs args)
-		{
-			return;
-		}
-	
-		protected void on_toolbutton2_clicked(object o, EventArgs args)
-		{
-			FileSelection fDlg = new FileSelection("Choose a File");
-			fDlg.Modal = true;
-    		
-			int nRc = fDlg.Run();
-			fDlg.Hide();
-    
-			if(nRc == (int)ResponseType.Ok) 
-			{
-			}     
-			return;
-		}
-	
-		protected void on_toolbutton3_clicked(object o, EventArgs args)
-		{
-			Application.Quit();
-			return;
-		}
-	
-		#endregion
-	
-		#region Menu item handlers
-
-
-
-		protected void on_quit1_activate(object o, EventArgs args)
-		{
-			Application.Quit();
-			return;
-		}
-
-		protected void on_create_sample_credential1_activate(object o, EventArgs args)
-		{
-			Secret secret = ss.getSecret(0, "SampleCredential", Secret.SS_CREDSET, "");
-			secret.setKeyValuePair(SHS_CN,"userCN");
-			secret.setKeyValuePair(SHS_DN_LDAP, "cn=admin,o=novell");
-			secret.setKeyValuePair(SHS_DN_NDAP, "admin.novell");
-			secret.setKeyValuePair(SHS_EMAIL, "admin@novell.com");
-			secret.setKeyValuePair(SHS_PASSWORD, "userPassword");
-
-			ss.setSecret(0, secret, Secret.SS_CREDSET);
-			showSecrets();
-		}
-
-
-		protected void on_cut1_activate(object o, EventArgs args)
-		{
-			return;
-		}
-
-		protected void on_copy1_activate(object o, EventArgs args)
-		{
-			return;
-		}
-
-		protected void on_delete1_activate(object o, EventArgs args)
-		{
-			return;
-		}
-
-		protected void on_paste1_activate(object o, EventArgs args)
-		{
-			return;
-		}
-
-		protected void on_about1_activate(object o, EventArgs args)
-		{
-			System.Text.StringBuilder AuthorStringBuild = new System.Text.StringBuilder ();
-            
-			AuthorStringBuild.Append ("SecretStore Client Version 4.0\n\n");
-			AuthorStringBuild.Append ("Sample GUI Application.\n");
-			AuthorStringBuild.Append ("Copyright (c) 2004\n\n");
-            
-			Gtk.MessageDialog md = new Gtk.MessageDialog (
-				this.window1,
-				DialogFlags.DestroyWithParent,
-				MessageType.Info,
-				ButtonsType.Ok, 
-				AuthorStringBuild.ToString ()
-				);
-            
-			int result = md.Run ();
-			md.Hide();
-            
-			return;
-		}
-
-		#endregion
-
-		// Common functions use by buttons and menu items
-
-
-
-
-		public void on_button8_clicked(object o, EventArgs args)
-		{
-			Console.WriteLine("Sync Called");									
-		}
-
-		private void showSecrets()
-		{
-			store.Clear();
-			StringCollection sc = ss.enumerateSecretIDs();
-			if (sc != null)
-			{
-				StringEnumerator se = sc.GetEnumerator();
-				se.Reset();
-				while (se.MoveNext())
-				{
-					//listBox2.Items.Add(se.Current);
-					store.Append(out secretIter);
-					store.SetValue(secretIter, 0, se.Current);
-				}
-			}
-		}
-
-		public void on_button10_clicked (object o, EventArgs args)		
-		{
-
-			showSecrets();
-
-			/*
-			for (int i=0; i<10; i++)
-			{
-				store.AppendValues("[ " + System.DateTime.Now.ToString() + " ]");
-				treeview1.ShowAll();
-				treeview1.Show();
-				
-				System.Threading.Thread.Sleep(100);
-				
-			}
-			*/
-		}
-
-		public void on_btnDeleteSecret_clicked(object o, EventArgs args)
-		{
-			Console.WriteLine("on_btnDeleteSecret_clicked");
-			
-			TreeModel model;
-			TreeIter iter;
-			string selected = "no selection";
-
-			// you get the iter and the model if something is selected
-			if (treeview1.Selection.GetSelected (out model, out iter))
-				selected = (string) model.GetValue (iter, 0);
-
-			Console.WriteLine (selected);
-			ss.removeSecret(selected.Substring(11), 2);
-			showSecrets();		
-		
-		}		
-
-		public void on_btnAddSecret_clicked(object o, EventArgs args)
-		{
-			Glade.XML gxml = new Glade.XML (null, "gladesharp1.glade", "addSecretWindow", null);				
-			gxml.Autoconnect (this);	
-			
-			addSecretWindow.Show();
-		}
-
-		public void on_btnOKAddSecret_clicked(object o, EventArgs args)
-		{
-			// add this secret
-			string sSecretID = entrySecretID.Text;
-			if (sSecretID != null && sSecretID.Length > 0)
-			{
-				string sUsername = entryUsername.Text;
-				string sPassword = entryPassword.Text;
-				if ((sUsername != null) && (sPassword != null))
-				{
-					Secret secret = ss.getSecret(0, sSecretID, Secret.SS_CREDSET, "");
-					secret.setKeyValuePair(SHS_CN, sUsername);
-					secret.setKeyValuePair(SHS_PASSWORD, sPassword);
-
-					// get the rest
-					if (entryNDAP.Text != null && entryNDAP.Text.Length > 0)
-						secret.setKeyValuePair(SHS_DN_NDAP, entryNDAP.Text);
-
-					if (entryLDAP.Text != null && entryLDAP.Text.Length > 0)
-						secret.setKeyValuePair(SHS_DN_LDAP, entryLDAP.Text);
-
-					if (entryEMAIL.Text != null && entryEMAIL.Text.Length > 0)
-						secret.setKeyValuePair(SHS_EMAIL, entryEMAIL.Text);
-
-
-
-					ss.setSecret(0, secret, Secret.SS_CREDSET);					
-					showSecrets();
-					addSecretWindow.HideAll();
-				}		
-			}
-			else
-			{
-				System.Text.StringBuilder AuthorStringBuild = new System.Text.StringBuilder ();
-            
-				AuthorStringBuild.Append ("You must enter a SecretID\n\n");												
-            
-				Gtk.MessageDialog md = new Gtk.MessageDialog (
-					this.window1,
-					DialogFlags.DestroyWithParent,
-					MessageType.Warning,
-					ButtonsType.Ok, 
-					AuthorStringBuild.ToString ()
-					);
-            
-				int result = md.Run ();
-				md.Hide();
-			}
-		}
-		public void on_btnCancelAddSecret_clicked(object o, EventArgs args)
-		{
-			addSecretWindow.HideAll();			
-		}
-
-		public void on_btnEditSecret_clicked(object o, EventArgs args)
-		{
-			// edit the selected secret
-			TreeModel model;
-			TreeIter iter;
-			string selected = null; //"no selection";
-
-			// you get the iter and the model if something is selected
-			if (treeview1.Selection.GetSelected (out model, out iter))
-				selected = (string) model.GetValue (iter, 0);
-
-			if (selected != null && selected.Length > 0)
-			{
-				selected = selected.Substring(11);
-				Secret secret = ss.getSecret(0, selected, Secret.SS_CREDSET, "");
-				Glade.XML gxml = new Glade.XML (null, "gladesharp1.glade", "displaySecretWindow", null);				
-				gxml.Autoconnect (this);
-				
-				TreeStore storeKeyValue = new TreeStore(typeof (string), typeof (string));
-				storeKeyValue.SetSortColumnId(0, Gtk.SortType.Ascending);
-						
-				TreeIter iterKV = new TreeIter();
-                        
-				NameValueCollection nvc = secret.getKeyValueCollection();
-								
-				for (int i=0; i<nvc.Count; i++)
-				{
-					string key = nvc.GetKey(i);
-					string[] sValues = nvc.GetValues(key);
-
-					//GLib.Value Key = new GLib.Value (key);
-					//GLib.Value Value = new GLib.Value (sValues[0]);
-					storeKeyValue.Append (out iterKV);
-					storeKeyValue.SetValue (iterKV, 0, key);
-					storeKeyValue.SetValue (iterKV, 1, secret.getKeyValue(key));					
-				}
-
-
-				tvKeyValue.AppendColumn("Key", new CellRendererText(), "text", 0);
-				tvKeyValue.AppendColumn("Value", new CellRendererText(), "text", 1);			
-
-				tvKeyValue.Model = storeKeyValue;
-	
-				label22.Text = selected;
-				
-				DateTime created = date1970.AddSeconds(secret.getCreateTime());
-				DateTime mod = date1970.AddSeconds(secret.getModifiedTime());
-				DateTime accessTime = date1970.AddSeconds(secret.getAccessTime());
-			
-				string test = created.ToLongDateString() + " @ " + created.ToLocalTime().ToShortTimeString();
-				labelCreated.Text = test;
-
-				labelAccessed.Text = accessTime.ToLocalTime().ToLongDateString()+ " @ " + accessTime.ToLocalTime().ToShortTimeString();
-				labelModified.Text = mod.ToLocalTime().ToLongDateString()+ " @ " + mod.ToLocalTime().ToShortTimeString();
-
-				displaySecretWindow.Show();				
-			}
-		}
-
-		public void on_btnEditSecret1_clicked(object o, EventArgs args)
-		{
-			// edit the selected secret
-			TreeModel model;
-			TreeIter iter;
-			string selected = "no selection";
-
-			// you get the iter and the model if something is selected
-			if (treeview1.Selection.GetSelected (out model, out iter))
-				selected = (string) model.GetValue (iter, 0);
-
-
-			if (selected != null && selected.Length > 0)
-			{
-				selected = selected.Substring(11);
-				Secret secret = ss.getSecret(0, selected, Secret.SS_CREDSET, "");
-
-				Glade.XML gxml = new Glade.XML (null, "gladesharp1.glade", "addSecretWindow", null);				
-				gxml.Autoconnect (this);
-				
-				entrySecretID.Text = selected;
-				entrySecretID.Editable = false;
-				
-				if (secret.getKeyValue("CN") !=null)
-					entryUsername.Text = secret.getKeyValue("CN");
-
-				if (secret.getKeyValue("password") !=null)
-					entryPassword.Text = secret.getKeyValue("password");
-
-				addSecretWindow.Title = "Edit Secret";
-				addSecretWindow.Show();
-				
-			}
-		}
-
-		public void on_btnRemoveAll_clicked(object o, EventArgs args)
-		{
-
-			System.Text.StringBuilder AuthorStringBuild = new System.Text.StringBuilder ();
-            
-			AuthorStringBuild.Append ("Remove All\n\n Are you sure?");												
-            
-			Gtk.MessageDialog md = new Gtk.MessageDialog (
-				this.window1,
-				DialogFlags.DestroyWithParent,
-				MessageType.Question,
-				ButtonsType.YesNo, 
-				AuthorStringBuild.ToString ()
-				);
-            
-			int result = md.Run ();
-			md.Hide();
-
-
-			if (result == -8)
-			{
-				//enum the secrets and remove
-				StringCollection sc = ss.enumerateSecretIDs();
-				if (sc != null)
-				{
-					StringEnumerator se = sc.GetEnumerator();
-					se.Reset();
-					while (se.MoveNext())
-					{
-						ss.removeSecret(se.Current.Substring(11),2);										
-					}
-				}
-				showSecrets();
-			}
-		}
-
-		private void getRemoteSecrets()
-		{
-			if (b_isAuthenticated)
-			{
-				logActivity("Getting remote secrets");
-				string[] saSecrets = m_rs.enumerateSecrets();
-				// add these secrets to our local cache
-				if (saSecrets != null)
-				{
-					if (ss == null)
-						ss = new SecretStore();
-
-					for (int i=0; i<saSecrets.Length; i++)
-					{
-						string sSecretID = saSecrets[i].Trim();
-						//logActivity("Getting remote secret: "+sSecretID);
-						RemoteSecret remoteSecret = m_rs.getSecret(sSecretID);					
-						if (remoteSecret != null)
-						{		
-							// SS_Credset:
-							logActivity("Adding remote secret: "+sSecretID);					
-							if (sSecretID.StartsWith("SS_Cred") || sSecretID.StartsWith("SS_App"))
-							{
-								Secret localSecret;
-								int iSecretType = Secret.SS_BINARY;
-								if (sSecretID.StartsWith("SS_Cred"))
-								{
-									localSecret = ss.getSecret(0, saSecrets[i].Trim().Substring(11), Secret.SS_CREDSET, null);
-									iSecretType = Secret.SS_CREDSET;
-								}
-								else
-								{
-									localSecret = ss.getSecret(0, saSecrets[i].Trim().Substring(10), Secret.SS_APP, null);
-									iSecretType = Secret.SS_APP;
-								}
-
-								localSecret.mergeKeyValueCollection(remoteSecret.getKeyValueCollection());
-								ss.setSecret(0, localSecret, iSecretType);
-							}
-							else
-							{
-								logActivity("Retrieved unhandled secret: "+sSecretID);
-							}
-						}										
-						else
-							logActivity("Secret not found: "+sSecretID);
-					}			
-					showSecrets();
-				}
-			}
-			else
-			{
-				logActivity("User not authenticated to remote store");
-				displayError("You are not authenticated to remote store");
-			}
-
-		}
-
-
-		public void on_btnLogin_clicked(object o, EventArgs args)
-		{
-			if (!b_isAuthenticated)
-			{
-				
-				statusbar1.Push(1, "Authenticating to server please wait");
-				System.Threading.Thread.Sleep(100);
-
-
-				m_rs = RemoteStore.getInstance();
-				string host = entryLoginServer.Text.Trim();
-				string userId = entryLoginUser.Text.Trim();
-				string password = entryLoginPassword.Text.Trim();
-				logActivity("Authenticating to "+host);
-				
-				try
-				{
-					m_rs.connect(host, userId, password, "");
-				}
-				catch (Exception e)
-				{
-					displayError(e.ToString());
-					return;
-				}
-
-				//logActivity("Authenticated!");
-
-				b_isAuthenticated = true;
-				statusbar1.Push(1, "Authenticated to "+ host);
-				logActivity("Authenticated");
-				Gtk.Button login = (Gtk.Button)o;
-				login.Label = "Logout";
-
-
-				label11.LabelProp = "<b>Server Information -- Authenticated </b>";
-				//label11.Text = "<b>Server Information</b> -- Authenticated to Server";
-				getRemoteSecrets();
-			}
-			else
-			{
-				// logout
-				b_isAuthenticated = false;
-				Gtk.Button login = (Gtk.Button)o;
-				label11.LabelProp = "<b>Server Information</b>";
-				login.Label = "Login";
-				statusbar1.Push(1, "Logged out");
-				
-			}
-		}
-
-		public void on_btnRefreshRemote_clicked(object o, EventArgs args)
-		{
-			getRemoteSecrets();
-			showSecrets();
-		}
-
-
-		private void displayMessage(string message, MessageType messageType)
-		{
-			System.Text.StringBuilder AuthorStringBuild = new System.Text.StringBuilder ();
-            
-			AuthorStringBuild.Append (message);												
-            
-			Gtk.MessageDialog md = new Gtk.MessageDialog (
-				this.window1,
-				DialogFlags.DestroyWithParent,
-				MessageType.Warning,
-				ButtonsType.Ok, 
-				AuthorStringBuild.ToString ()
-				);
-            
-			int result = md.Run ();
-			md.Hide();
-		}
-
-		private void displayMessageInfo(string message)
-		{
-			displayMessage(message, MessageType.Info);
-		}
-		private void displayError(string message)
-		{
-			displayMessage(message, MessageType.Warning);
-		}
-
-		private void on_btnSyncFromServer_clicked(object o, EventArgs args)
-		{
-			getRemoteSecrets();
-		}
-		private void on_btnClearActivity_clicked(object o, EventArgs args)
-		{
-			tsActivityStore.Clear();
-		}
-
-		private void on_btnSync2Server_clicked(object sender, EventArgs args)
-		{
-			if (b_isAuthenticated)
-			{
-				// get local secrets
-				StringCollection sc = ss.enumerateSecretIDs();
-				if (sc != null)
-				{
-					StringEnumerator se = sc.GetEnumerator();
-					se.Reset();
-					while (se.MoveNext())
-					{
-
-						string sID = se.Current;
-
-						if (sID.StartsWith("SS_CredSet:"))
-						{				
-							sID = sID.Substring(sID.IndexOf(":") + 1);
-							//type = Secret.SS_CREDSET;
-						}
-
-						Secret localSecret = ss.getSecret(0, sID, 2, null);
-										
-						RemoteSecret rs = new RemoteSecret(sID, 0, 0 ,0);
-						rs.setKeyValueCollection(localSecret.getKeyValueCollection());
-						if (m_rs != null)
-						{
-							m_rs.setSecret(rs);
-							logActivity("Sending " + se.Current + " to server");
-						}
-					}
-				}
-			}
-
-		}
-
-		protected void on_btnServerStartStop_clicked(object o, EventArgs args)
-		{
-
-			Gtk.Button btn = (Gtk.Button)o;
-			/*
-			if (m_remoteServer == null)
-			{
-				m_remoteServer = new RemoteServer();
-
-
-				try 
-				{
-					int iPort = Int32.Parse(entryServerPort.Text);
-					m_remoteServer.startServer(iPort);
-					labelServerStatus.Text = "Running";
-				}
-				catch (Exception e)
-				{
-					displayError("Port in use\r\n"+ e.ToString());
-					return;
-				}
-
-				logActivity("Server started on port: "+entryServerPort.Text);
-				btn.Label = "Stop Server";
-			}
-			else
-			{
-				m_remoteServer.stopServer();
-				btn.Label = "Start Server";
-				logActivity("Server stopped");
-				labelServerStatus.Text = "Stopped";
-				m_remoteServer = null;
-			}
-			*/
-		}
-
-		protected void on_btnGetRemoteSecrets_clicked(object o, EventArgs args)
-		{
-
-			RemoteClient rc = new RemoteClient();
-
-			if ((entryHost.Text == null) || (entryHost.Text.Length < 1))
-			{
-				displayError("Please enter a Remote computer ");
-				return;
-			}
-			
-			
-			try 
-			{
-				rc.openSocket(entryHost.Text, entryHostPort.Text);
-			}
-			catch (Exception e)
-			{
-				displayError(e.ToString());
-				return;
-			}
-
-			try 
-			{
-				StringCollection sc = rc.getRemoteSecretIDS();
-
-				if (sc != null)
-				{
-					StringBuilder sb = new StringBuilder();
-					sb.Append("The following secrets were added:\r\n");
-					StringEnumerator se = sc.GetEnumerator();
-					se.Reset();
-					while (se.MoveNext())
-					{
-						logActivity("Retrieved "+se.Current+" from " + entryHost.Text);
-						Secret remoteSecret = rc.getRemoteSecret(se.Current);
-						sb.Append(se.Current+"\r\n");
-
-						// add it to our local cache
-						Secret localSecret = ss.getSecret(se.Current);
-						localSecret.mergeKeyValueCollection(remoteSecret.getKeyValueCollection());
-						ss.setSecret(0, localSecret, localSecret.getSecretType());
-					}
-
-					displayMessageInfo(sb.ToString());
-				}
-			}
-			catch (Exception e)
-			{
-				displayError(e.ToString());
-			}
-
-			rc.closeSocket();
-			showSecrets();
-		}
-
-		private string getNetworkUserID()
-		{
-
-			Secret sec = ss.getSecret("SS_Cred:Default_Credential");
-			string sUsername = sec.getKeyValue("CN");
-
-			if (sUsername == null || sUsername.Length < 1)
-			{
-				sUsername = System.Environment.UserName.ToString();
-	
-			}
-			return sUsername;
-		}
-	}
-}
\ No newline at end of file
diff --git a/c_sharp/GladeSharp2/GladeSharp2.csproj b/c_sharp/GladeSharp2/GladeSharp2.csproj
deleted file mode 100644
index 10351866..00000000
--- a/c_sharp/GladeSharp2/GladeSharp2.csproj
+++ /dev/null
@@ -1,155 +0,0 @@
-<VisualStudioProject>
-    <CSHARP
-        ProjectType = "Local"
-        ProductVersion = "7.10.3077"
-        SchemaVersion = "2.0"
-        ProjectGuid = "{DC9434D2-9868-40BE-8AFA-F5CF9B6D5BC3}"
-    >
-        <Build>
-            <Settings
-                ApplicationIcon = ""
-                AssemblyKeyContainerName = ""
-                AssemblyName = "SecretStoreClientManager"
-                AssemblyOriginatorKeyFile = ""
-                DefaultClientScript = "JScript"
-                DefaultHTMLPageLayout = "Grid"
-                DefaultTargetSchema = "IE50"
-                DelaySign = "false"
-                OutputType = "WinExe"
-                PreBuildEvent = ""
-                PostBuildEvent = ""
-                RootNamespace = ""
-                RunPostBuildEvent = "OnBuildSuccess"
-                StartupObject = ""
-            >
-                <Config
-                    Name = "Debug"
-                    AllowUnsafeBlocks = "false"
-                    BaseAddress = "285212672"
-                    CheckForOverflowUnderflow = "false"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = "DEBUG;TRACE"
-                    DocumentationFile = ""
-                    DebugSymbols = "true"
-                    FileAlignment = "4096"
-                    IncrementalBuild = "false"
-                    NoStdLib = "false"
-                    NoWarn = ""
-                    Optimize = "false"
-                    OutputPath = "bin\Debug\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "4"
-                />
-                <Config
-                    Name = "Release"
-                    AllowUnsafeBlocks = "false"
-                    BaseAddress = "285212672"
-                    CheckForOverflowUnderflow = "false"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = "TRACE"
-                    DocumentationFile = ""
-                    DebugSymbols = "false"
-                    FileAlignment = "4096"
-                    IncrementalBuild = "false"
-                    NoStdLib = "false"
-                    NoWarn = ""
-                    Optimize = "true"
-                    OutputPath = "bin\Release\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "4"
-                />
-            </Settings>
-            <References>
-                <Reference
-                    Name = "System"
-                    AssemblyName = "System"
-                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
-                />
-                <Reference
-                    Name = "System.Data"
-                    AssemblyName = "System.Data"
-                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
-                />
-                <Reference
-                    Name = "System.XML"
-                    AssemblyName = "System.Xml"
-                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
-                />
-                <Reference
-                    Name = "atk-sharp"
-                    AssemblyName = "atk-sharp"
-                    HintPath = "C:\Program Files\Common Files\GTK\2.4\lib\gtk-sharp-2.0\atk-sharp.dll"
-                    AssemblyFolderKey = "hklm\gtk-sharp"
-                />
-                <Reference
-                    Name = "gdk-sharp"
-                    AssemblyName = "gdk-sharp"
-                    HintPath = "C:\Program Files\Common Files\GTK\2.4\lib\gtk-sharp-2.0\gdk-sharp.dll"
-                    AssemblyFolderKey = "hklm\gtk-sharp"
-                />
-                <Reference
-                    Name = "glade-sharp"
-                    AssemblyName = "glade-sharp"
-                    HintPath = "C:\Program Files\Common Files\GTK\2.4\lib\gtk-sharp-2.0\glade-sharp.dll"
-                    AssemblyFolderKey = "hklm\gtk-sharp"
-                />
-                <Reference
-                    Name = "glib-sharp"
-                    AssemblyName = "glib-sharp"
-                    HintPath = "C:\Program Files\Common Files\GTK\2.4\lib\gtk-sharp-2.0\glib-sharp.dll"
-                    AssemblyFolderKey = "hklm\gtk-sharp"
-                />
-                <Reference
-                    Name = "gtk-sharp"
-                    AssemblyName = "gtk-sharp"
-                    HintPath = "C:\Program Files\Common Files\GTK\2.4\lib\gtk-sharp-2.0\gtk-sharp.dll"
-                    AssemblyFolderKey = "hklm\gtk-sharp"
-                />
-                <Reference
-                    Name = "pango-sharp"
-                    AssemblyName = "pango-sharp"
-                    HintPath = "C:\Program Files\Common Files\GTK\2.4\lib\gtk-sharp-2.0\pango-sharp.dll"
-                    AssemblyFolderKey = "hklm\gtk-sharp"
-                />
-                <Reference
-                    Name = "NSSSWrapper"
-                    AssemblyName = "NSSSWrapper"
-                    HintPath = "..\NSSSWrapper\bin\Debug\NSSSWrapper.dll"
-                />
-                <Reference
-                    Name = "Novell.CASA.miCASAWrapper"
-                    AssemblyName = "Novell.CASA.miCASAWrapper"
-                    HintPath = "..\NSSCSWrapper\bin\Debug\Novell.CASA.miCASAWrapper.dll"
-                />
-            </References>
-        </Build>
-        <Files>
-            <Include>
-                <File
-                    RelPath = "AssemblyInfo.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "Driver.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "gladesharp1.glade"
-                    BuildAction = "EmbeddedResource"
-                />
-                <File
-                    RelPath = "gladesharp1.xsx"
-                    DependentUpon = "gladesharp1.glade"
-                    BuildAction = "None"
-                />
-            </Include>
-        </Files>
-    </CSHARP>
-</VisualStudioProject>
-
diff --git a/c_sharp/GladeSharp2/GladeSharp2.csproj.user b/c_sharp/GladeSharp2/GladeSharp2.csproj.user
deleted file mode 100644
index f0dd8860..00000000
--- a/c_sharp/GladeSharp2/GladeSharp2.csproj.user
+++ /dev/null
@@ -1,48 +0,0 @@
-<VisualStudioProject>
-    <CSHARP LastOpenVersion = "7.10.3077" >
-        <Build>
-            <Settings ReferencePath = "D:\ccm\SSClient\SecretStoreClient_src\c_sharp\NSSCSWrapper\bin\Debug\;D:\ccm\SSClient\SecretStoreClient_src\c_sharp\NSSSWrapper\bin\Debug\;D:\ccm\SSClient\SecretStoreClient_src_KEEP3\c_sharp\NSSCSWrapper\bin\Debug\;D:\ccm\SSClient\SecretStoreClient_src_KEEP3\c_sharp\NSSSWrapper\bin\Debug\" >
-                <Config
-                    Name = "Debug"
-                    EnableASPDebugging = "false"
-                    EnableASPXDebugging = "false"
-                    EnableUnmanagedDebugging = "false"
-                    EnableSQLServerDebugging = "false"
-                    RemoteDebugEnabled = "false"
-                    RemoteDebugMachine = ""
-                    StartAction = "Project"
-                    StartArguments = ""
-                    StartPage = ""
-                    StartProgram = ""
-                    StartURL = ""
-                    StartWorkingDirectory = ""
-                    StartWithIE = "true"
-                />
-                <Config
-                    Name = "Release"
-                    EnableASPDebugging = "false"
-                    EnableASPXDebugging = "false"
-                    EnableUnmanagedDebugging = "false"
-                    EnableSQLServerDebugging = "false"
-                    RemoteDebugEnabled = "false"
-                    RemoteDebugMachine = ""
-                    StartAction = "Project"
-                    StartArguments = ""
-                    StartPage = ""
-                    StartProgram = ""
-                    StartURL = ""
-                    StartWorkingDirectory = ""
-                    StartWithIE = "false"
-                />
-            </Settings>
-        </Build>
-        <OtherProjectSettings
-            CopyProjectDestinationFolder = ""
-            CopyProjectUncPath = ""
-            CopyProjectOption = "0"
-            ProjectView = "ProjectFiles"
-            ProjectTrust = "0"
-        />
-    </CSHARP>
-</VisualStudioProject>
-
diff --git a/c_sharp/GladeSharp2/GladeSharp2.sln b/c_sharp/GladeSharp2/GladeSharp2.sln
deleted file mode 100644
index 9a1608f6..00000000
--- a/c_sharp/GladeSharp2/GladeSharp2.sln
+++ /dev/null
@@ -1,37 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GladeSharp2", "GladeSharp2.csproj", "{DC9434D2-9868-40BE-8AFA-F5CF9B6D5BC3}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novell.CASA.miCASAWrapper", "..\NSSCSWrapper\Novell.CASA.miCASAWrapper.csproj", "{E21DD887-22F4-4935-9851-409715F663B0}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novell.SecretStore.NSSSWrapper", "..\NSSSWrapper\Novell.SecretStore.NSSSWrapper.csproj", "{7D8C5C67-C1B9-486A-8F7B-1D915FD2048E}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Release = Release
-	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{DC9434D2-9868-40BE-8AFA-F5CF9B6D5BC3}.Debug.ActiveCfg = Debug|.NET
-		{DC9434D2-9868-40BE-8AFA-F5CF9B6D5BC3}.Debug.Build.0 = Debug|.NET
-		{DC9434D2-9868-40BE-8AFA-F5CF9B6D5BC3}.Release.ActiveCfg = Release|.NET
-		{DC9434D2-9868-40BE-8AFA-F5CF9B6D5BC3}.Release.Build.0 = Release|.NET
-		{E21DD887-22F4-4935-9851-409715F663B0}.Debug.ActiveCfg = Debug|.NET
-		{E21DD887-22F4-4935-9851-409715F663B0}.Debug.Build.0 = Debug|.NET
-		{E21DD887-22F4-4935-9851-409715F663B0}.Release.ActiveCfg = Release|.NET
-		{E21DD887-22F4-4935-9851-409715F663B0}.Release.Build.0 = Release|.NET
-		{7D8C5C67-C1B9-486A-8F7B-1D915FD2048E}.Debug.ActiveCfg = Debug|.NET
-		{7D8C5C67-C1B9-486A-8F7B-1D915FD2048E}.Debug.Build.0 = Debug|.NET
-		{7D8C5C67-C1B9-486A-8F7B-1D915FD2048E}.Release.ActiveCfg = Release|.NET
-		{7D8C5C67-C1B9-486A-8F7B-1D915FD2048E}.Release.Build.0 = Release|.NET
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
-EndGlobal
diff --git a/c_sharp/GladeSharp2/GladeSharp2.suo b/c_sharp/GladeSharp2/GladeSharp2.suo
deleted file mode 100644
index 2a2d384b..00000000
Binary files a/c_sharp/GladeSharp2/GladeSharp2.suo and /dev/null differ
diff --git a/c_sharp/GladeSharp2/gladesharp1.glade b/c_sharp/GladeSharp2/gladesharp1.glade
deleted file mode 100644
index 727ee020..00000000
--- a/c_sharp/GladeSharp2/gladesharp1.glade
+++ /dev/null
@@ -1,1954 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkWindow" id="window1">
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">SecretStore Client Service</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_CENTER_ALWAYS</property>
-  <property name="modal">False</property>
-  <property name="default_width">400</property>
-  <property name="default_height">300</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <signal name="delete_event" handler="on_window1_delete_event" last_modification_time="Mon, 20 Dec 2004 15:54:21 GMT"/>
-
-  <child>
-    <widget class="GtkVBox" id="vbox1">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child>
-	<widget class="GtkVBox" id="vbox2">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkMenuBar" id="menubar1">
-	      <property name="visible">True</property>
-
-	      <child>
-		<widget class="GtkMenuItem" id="menuitem1">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">_File</property>
-		  <property name="use_underline">True</property>
-
-		  <child>
-		    <widget class="GtkMenu" id="menuitem1_menu">
-
-		      <child>
-			<widget class="GtkImageMenuItem" id="quit1">
-			  <property name="visible">True</property>
-			  <property name="label">gtk-quit</property>
-			  <property name="use_stock">True</property>
-			  <signal name="activate" handler="on_quit1_activate" last_modification_time="Mon, 20 Dec 2004 15:40:23 GMT"/>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-
-	      <child>
-		<widget class="GtkMenuItem" id="menuitem2">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">_Edit</property>
-		  <property name="use_underline">True</property>
-
-		  <child>
-		    <widget class="GtkMenu" id="menuitem2_menu">
-
-		      <child>
-			<widget class="GtkMenuItem" id="create_sample_credential1">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Create Sample Credential</property>
-			  <property name="use_underline">True</property>
-			  <signal name="activate" handler="on_create_sample_credential1_activate" last_modification_time="Sun, 13 Mar 2005 03:30:23 GMT"/>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-
-	      <child>
-		<widget class="GtkMenuItem" id="menuitem3">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">_View</property>
-		  <property name="use_underline">True</property>
-		</widget>
-	      </child>
-
-	      <child>
-		<widget class="GtkMenuItem" id="menuitem4">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">_Help</property>
-		  <property name="use_underline">True</property>
-
-		  <child>
-		    <widget class="GtkMenu" id="menuitem4_menu">
-
-		      <child>
-			<widget class="GtkMenuItem" id="about1">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_About</property>
-			  <property name="use_underline">True</property>
-			  <signal name="activate" handler="on_about1_activate" last_modification_time="Mon, 20 Dec 2004 15:40:23 GMT"/>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkImage" id="image2">
-	  <property name="visible">True</property>
-	  <property name="pixbuf">/Bitmap.bmp</property>
-	  <property name="xalign">0.5</property>
-	  <property name="yalign">0.5</property>
-	  <property name="xpad">0</property>
-	  <property name="ypad">0</property>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkNotebook" id="notebook1">
-	  <property name="visible">True</property>
-	  <property name="can_focus">True</property>
-	  <property name="show_tabs">True</property>
-	  <property name="show_border">True</property>
-	  <property name="tab_pos">GTK_POS_TOP</property>
-	  <property name="scrollable">False</property>
-	  <property name="enable_popup">False</property>
-
-	  <child>
-	    <widget class="GtkVBox" id="vbox4">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
-
-	      <child>
-		<widget class="GtkFrame" id="frame2">
-		  <property name="border_width">10</property>
-		  <property name="visible">True</property>
-		  <property name="label_xalign">0</property>
-		  <property name="label_yalign">0.5</property>
-		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-		  <child>
-		    <widget class="GtkAlignment" id="alignment2">
-		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xscale">1</property>
-		      <property name="yscale">1</property>
-		      <property name="top_padding">0</property>
-		      <property name="bottom_padding">0</property>
-		      <property name="left_padding">12</property>
-		      <property name="right_padding">0</property>
-
-		      <child>
-			<widget class="GtkTable" id="table1">
-			  <property name="visible">True</property>
-			  <property name="n_rows">3</property>
-			  <property name="n_columns">2</property>
-			  <property name="homogeneous">False</property>
-			  <property name="row_spacing">3</property>
-			  <property name="column_spacing">0</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label9">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">User ID    </property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label10">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Password</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkEntry" id="entry2">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="editable">True</property>
-			      <property name="visibility">True</property>
-			      <property name="max_length">0</property>
-			      <property name="text" translatable="yes"></property>
-			      <property name="has_frame">True</property>
-			      <property name="invisible_char">*</property>
-			      <property name="activates_default">False</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="x_padding">5</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkEntry" id="entry7">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="editable">True</property>
-			      <property name="visibility">True</property>
-			      <property name="max_length">0</property>
-			      <property name="text" translatable="yes"></property>
-			      <property name="has_frame">True</property>
-			      <property name="invisible_char">*</property>
-			      <property name="activates_default">False</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="x_padding">5</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label8">
-		      <property name="height_request">30</property>
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Local User Information&lt;/b&gt; (TBD)</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">True</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="type">label_item</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkFrame" id="frame3">
-		  <property name="border_width">10</property>
-		  <property name="visible">True</property>
-		  <property name="label_xalign">0</property>
-		  <property name="label_yalign">0.5</property>
-		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-		  <child>
-		    <widget class="GtkAlignment" id="alignment3">
-		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xscale">1</property>
-		      <property name="yscale">1</property>
-		      <property name="top_padding">0</property>
-		      <property name="bottom_padding">0</property>
-		      <property name="left_padding">12</property>
-		      <property name="right_padding">0</property>
-
-		      <child>
-			<widget class="GtkTable" id="table2">
-			  <property name="visible">True</property>
-			  <property name="n_rows">5</property>
-			  <property name="n_columns">2</property>
-			  <property name="homogeneous">False</property>
-			  <property name="row_spacing">3</property>
-			  <property name="column_spacing">0</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label12">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Username</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label13">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Password </property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label14">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Server</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">2</property>
-			      <property name="bottom_attach">3</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkEntry" id="entryLoginUser">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="editable">True</property>
-			      <property name="visibility">True</property>
-			      <property name="max_length">0</property>
-			      <property name="text" translatable="yes">cn=admin,o=novell</property>
-			      <property name="has_frame">True</property>
-			      <property name="invisible_char">*</property>
-			      <property name="activates_default">False</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="x_padding">5</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkEntry" id="entryLoginServer">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="editable">True</property>
-			      <property name="visibility">True</property>
-			      <property name="max_length">0</property>
-			      <property name="text" translatable="yes">secretstore.novell.com</property>
-			      <property name="has_frame">True</property>
-			      <property name="invisible_char">*</property>
-			      <property name="activates_default">False</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">2</property>
-			      <property name="bottom_attach">3</property>
-			      <property name="x_padding">5</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkEntry" id="entryLoginPassword">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="editable">True</property>
-			      <property name="visibility">False</property>
-			      <property name="max_length">0</property>
-			      <property name="text" translatable="yes">novell</property>
-			      <property name="has_frame">True</property>
-			      <property name="invisible_char">*</property>
-			      <property name="activates_default">False</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="x_padding">5</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkButton" id="button11">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Login</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			      <signal name="clicked" handler="on_btnLogin_clicked" last_modification_time="Fri, 11 Mar 2005 22:51:17 GMT"/>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">4</property>
-			      <property name="bottom_attach">5</property>
-			      <property name="x_padding">120</property>
-			      <property name="y_padding">10</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label11">
-		      <property name="height_request">30</property>
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Server Information&lt;/b&gt;</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">True</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="type">label_item</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<placeholder/>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label1">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Account Information</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkVBox" id="vbox6">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox2">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <widget class="GtkScrolledWindow" id="scrolledwindow2">
-		      <property name="width_request">289</property>
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-		      <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-		      <property name="shadow_type">GTK_SHADOW_IN</property>
-		      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-		      <child>
-			<widget class="GtkTreeView" id="treeview1">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="headers_visible">False</property>
-			  <property name="rules_hint">False</property>
-			  <property name="reorderable">False</property>
-			  <property name="enable_search">True</property>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">5</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkVBox" id="vbox7">
-		      <property name="border_width">9</property>
-		      <property name="height_request">323</property>
-		      <property name="visible">True</property>
-		      <property name="homogeneous">True</property>
-		      <property name="spacing">35</property>
-
-		      <child>
-			<widget class="GtkButton" id="button10">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Refresh Local</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <signal name="clicked" handler="on_button10_clicked" last_modification_time="Tue, 08 Mar 2005 00:16:25 GMT"/>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkButton" id="btnAddSecret">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Add Credential</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <signal name="clicked" handler="on_btnAddSecret_clicked" last_modification_time="Tue, 08 Mar 2005 16:43:53 GMT"/>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkButton" id="btnDeleteSecret">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Delete Credential</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <signal name="clicked" handler="on_btnDeleteSecret_clicked" last_modification_time="Tue, 08 Mar 2005 16:11:30 GMT"/>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkButton" id="btnEditSecret">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">View Credential</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <signal name="clicked" handler="on_btnEditSecret_clicked" last_modification_time="Tue, 08 Mar 2005 18:28:05 GMT"/>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkButton" id="btnRemoveAll">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Remove All</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <signal name="clicked" handler="on_btnRemoveAll_clicked" last_modification_time="Fri, 11 Mar 2005 20:45:55 GMT"/>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkButton" id="btnRefreshRemote">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Refresh Remote</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <signal name="clicked" handler="on_btnRefreshRemote_clicked" last_modification_time="Fri, 11 Mar 2005 23:07:59 GMT"/>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">10</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">4</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		  <property name="pack_type">GTK_PACK_END</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label2">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Manage Secrets</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkVBox" id="vbox8">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox3">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox4">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkButton" id="btnSync2Server">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Sync to Server</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <signal name="clicked" handler="on_btnSync2Server_clicked" last_modification_time="Mon, 14 Mar 2005 23:50:33 GMT"/>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkButton" id="btnSyncFromServer">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Sync from Server</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <signal name="clicked" handler="on_btnSyncFromServer_clicked" last_modification_time="Mon, 14 Mar 2005 21:43:22 GMT"/>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkButton" id="btnClearActivity">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Clear activity</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <signal name="clicked" handler="on_btnClearActivity_clicked" last_modification_time="Mon, 14 Mar 2005 21:46:05 GMT"/>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkScrolledWindow" id="scrolledwindow3">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-		  <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-		  <property name="shadow_type">GTK_SHADOW_IN</property>
-		  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-		  <child>
-		    <widget class="GtkTreeView" id="listActivity">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="headers_visible">False</property>
-		      <property name="rules_hint">False</property>
-		      <property name="reorderable">False</property>
-		      <property name="enable_search">False</property>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label3">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">View Activity</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkVBox" id="vbox9">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
-
-	      <child>
-		<widget class="GtkFrame" id="frame4">
-		  <property name="border_width">16</property>
-		  <property name="visible">True</property>
-		  <property name="label_xalign">0</property>
-		  <property name="label_yalign">0.5</property>
-		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-		  <child>
-		    <widget class="GtkAlignment" id="alignment5">
-		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xscale">1</property>
-		      <property name="yscale">1</property>
-		      <property name="top_padding">0</property>
-		      <property name="bottom_padding">0</property>
-		      <property name="left_padding">12</property>
-		      <property name="right_padding">0</property>
-
-		      <child>
-			<widget class="GtkVBox" id="vbox11">
-			  <property name="height_request">33</property>
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">0</property>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox14">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">0</property>
-
-			      <child>
-				<widget class="GtkLabel" id="label34">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">This option starts a Server on this machine.
-
-Once the server is started, you can connect 
-to this machine from other computers and 
-retrieve your secrets</property>
-				  <property name="use_underline">False</property>
-				  <property name="use_markup">False</property>
-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				</widget>
-				<packing>
-				  <property name="padding">16</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkLabel" id="entryServerStatusLabel">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Server status:</property>
-				  <property name="use_underline">False</property>
-				  <property name="use_markup">False</property>
-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkLabel" id="labelServerStatus">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Stopped</property>
-				  <property name="use_underline">False</property>
-				  <property name="use_markup">False</property>
-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">9</property>
-				  <property name="ypad">0</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox13">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">0</property>
-
-			      <child>
-				<widget class="GtkEntry" id="entryServerPort">
-				  <property name="width_request">51</property>
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="editable">True</property>
-				  <property name="visibility">True</property>
-				  <property name="max_length">0</property>
-				  <property name="text" translatable="yes">8080</property>
-				  <property name="has_frame">True</property>
-				  <property name="invisible_char">*</property>
-				  <property name="activates_default">False</property>
-				</widget>
-				<packing>
-				  <property name="padding">15</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkButton" id="btnServerStartStop">
-				  <property name="height_request">6</property>
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Start Server</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				  <signal name="clicked" handler="on_btnServerStartStop_clicked" last_modification_time="Sun, 20 Mar 2005 18:05:53 GMT"/>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label30">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;DotNet Server Setup&lt;/b&gt;</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">True</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="type">label_item</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkFrame" id="frame5">
-		  <property name="border_width">13</property>
-		  <property name="height_request">102</property>
-		  <property name="visible">True</property>
-		  <property name="label_xalign">0</property>
-		  <property name="label_yalign">0.5</property>
-		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-		  <child>
-		    <widget class="GtkAlignment" id="alignment6">
-		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xscale">1</property>
-		      <property name="yscale">1</property>
-		      <property name="top_padding">0</property>
-		      <property name="bottom_padding">0</property>
-		      <property name="left_padding">12</property>
-		      <property name="right_padding">0</property>
-
-		      <child>
-			<widget class="GtkTable" id="table5">
-			  <property name="visible">True</property>
-			  <property name="n_rows">2</property>
-			  <property name="n_columns">3</property>
-			  <property name="homogeneous">False</property>
-			  <property name="row_spacing">0</property>
-			  <property name="column_spacing">0</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label32">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Host</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label33">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Port</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkButton" id="btnGetRemoteSecrets">
-			      <property name="width_request">71</property>
-			      <property name="height_request">32</property>
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Sync now</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			      <signal name="clicked" handler="on_btnGetRemoteSecrets_clicked" last_modification_time="Sun, 20 Mar 2005 18:19:19 GMT"/>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">2</property>
-			      <property name="right_attach">3</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkEntry" id="entryHost">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="editable">True</property>
-			      <property name="visibility">True</property>
-			      <property name="max_length">0</property>
-			      <property name="text" translatable="yes"></property>
-			      <property name="has_frame">True</property>
-			      <property name="invisible_char">*</property>
-			      <property name="activates_default">False</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="x_padding">10</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkEntry" id="entryHostPort">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="editable">True</property>
-			      <property name="visibility">True</property>
-			      <property name="max_length">0</property>
-			      <property name="text" translatable="yes">8080</property>
-			      <property name="has_frame">True</property>
-			      <property name="invisible_char">*</property>
-			      <property name="activates_default">False</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="x_padding">2</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label31">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Connect to server at:&lt;/b&gt;</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">True</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="type">label_item</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">38</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label15">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Preferences</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkStatusbar" id="statusbar1">
-	  <property name="visible">True</property>
-	  <property name="has_resize_grip">True</property>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkWindow" id="addSecretWindow">
-  <property name="border_width">22</property>
-  <property name="width_request">250</property>
-  <property name="height_request">230</property>
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Add Credential</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_CENTER_ALWAYS</property>
-  <property name="modal">True</property>
-  <property name="resizable">False</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_CENTER</property>
-
-  <child>
-    <widget class="GtkAlignment" id="alignment4">
-      <property name="visible">True</property>
-      <property name="xalign">0.5</property>
-      <property name="yalign">0.5</property>
-      <property name="xscale">1</property>
-      <property name="yscale">1</property>
-      <property name="top_padding">0</property>
-      <property name="bottom_padding">0</property>
-      <property name="left_padding">0</property>
-      <property name="right_padding">0</property>
-
-      <child>
-	<widget class="GtkTable" id="table3">
-	  <property name="visible">True</property>
-	  <property name="n_rows">7</property>
-	  <property name="n_columns">2</property>
-	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">5</property>
-	  <property name="column_spacing">5</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="labelSecretID">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">SecretID</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="entrySecretID">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label17">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Username</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="entryUsername">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox8">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
-
-	      <child>
-		<widget class="GtkButton" id="btnOKAddSecret">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label">gtk-add</property>
-		  <property name="use_stock">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		  <signal name="clicked" handler="on_btnOKAddSecret_clicked" last_modification_time="Tue, 08 Mar 2005 16:59:16 GMT"/>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="btnCancelAddSecret">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label">gtk-cancel</property>
-		  <property name="use_stock">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		  <signal name="clicked" handler="on_btnCancelAddSecret_clicked" last_modification_time="Tue, 08 Mar 2005 17:24:34 GMT"/>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">6</property>
-	      <property name="bottom_attach">7</property>
-	      <property name="x_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="entryPassword">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label18">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Password</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="entryNDAP">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="entryEMAIL">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">5</property>
-	      <property name="bottom_attach">6</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label19">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">DN_NDAP</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label20">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">eMail</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">5</property>
-	      <property name="bottom_attach">6</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label26">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">DN_LDAP</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">4</property>
-	      <property name="bottom_attach">5</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="entryLDAP">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">4</property>
-	      <property name="bottom_attach">5</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-	</widget>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkWindow" id="displaySecretWindow">
-  <property name="width_request">300</property>
-  <property name="height_request">400</property>
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Secret</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_CENTER</property>
-  <property name="modal">True</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">True</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_CENTER</property>
-
-  <child>
-    <widget class="GtkVBox" id="vbox10">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child>
-	<widget class="GtkHBox" id="hbox9">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="label21">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">SecretID</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">17</property>
-	      <property name="ypad">16</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label22">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes"></property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">20</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkScrolledWindow" id="scrolledwindow4">
-	  <property name="visible">True</property>
-	  <property name="can_focus">True</property>
-	  <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-	  <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-	  <property name="shadow_type">GTK_SHADOW_IN</property>
-	  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-	  <child>
-	    <widget class="GtkTreeView" id="tvKeyValue">
-	      <property name="border_width">20</property>
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="headers_visible">True</property>
-	      <property name="rules_hint">False</property>
-	      <property name="reorderable">False</property>
-	      <property name="enable_search">True</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkTable" id="table4">
-	  <property name="border_width">17</property>
-	  <property name="visible">True</property>
-	  <property name="n_rows">4</property>
-	  <property name="n_columns">2</property>
-	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">6</property>
-	  <property name="column_spacing">6</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="label23">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Date created</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label24">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Last accessed</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label25">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Last modified</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="labelCreated">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes"></property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="labelAccessed">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes"></property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="labelModified">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes"></property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<placeholder/>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkWindow" id="window3">
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">window3</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-
-  <child>
-    <placeholder/>
-  </child>
-</widget>
-
-</glade-interface>
diff --git a/c_sharp/GladeSharp2/gladesharp1.gladep b/c_sharp/GladeSharp2/gladesharp1.gladep
deleted file mode 100644
index e429f891..00000000
--- a/c_sharp/GladeSharp2/gladesharp1.gladep
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
-
-<glade-project>
-  <name></name>
-  <program_name></program_name>
-  <gnome_support>FALSE</gnome_support>
-</glade-project>
diff --git a/c_sharp/GladeSharp2/gladesharp1.xsx b/c_sharp/GladeSharp2/gladesharp1.xsx
deleted file mode 100644
index c4149bf9..00000000
--- a/c_sharp/GladeSharp2/gladesharp1.xsx
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--This file is auto-generated by the XML Schema Designer. It holds layout information for components on the designer surface.-->
-<XSDDesignerLayout />
\ No newline at end of file
diff --git a/c_sharp/GladeSharp2/pixmaps/Bitmap.bmp b/c_sharp/GladeSharp2/pixmaps/Bitmap.bmp
deleted file mode 100644
index e439f685..00000000
Binary files a/c_sharp/GladeSharp2/pixmaps/Bitmap.bmp and /dev/null differ
diff --git a/c_sharp/GladeSharp2/pixmaps/Thumbs.db b/c_sharp/GladeSharp2/pixmaps/Thumbs.db
deleted file mode 100644
index c07706de..00000000
Binary files a/c_sharp/GladeSharp2/pixmaps/Thumbs.db and /dev/null differ
diff --git a/c_sharp/GladeSharp2/pixmaps/banner.bmp b/c_sharp/GladeSharp2/pixmaps/banner.bmp
deleted file mode 100644
index 85c1a1c2..00000000
Binary files a/c_sharp/GladeSharp2/pixmaps/banner.bmp and /dev/null differ