From a61aa03e580f30ba3d5e941c3b5433c65bc38084 Mon Sep 17 00:00:00 2001 From: smanojna Date: Thu, 16 Feb 2006 12:14:15 +0000 Subject: [PATCH] - Bug 146015: A CASAkeyring is created to add secrets to the Gnome Keyring through CASAManger - FIXED. --- CASA.changes | 6 ++++++ c_adlib/GKEngine.cs | 4 ++-- c_adlib/ad_gk/native/ad_gk.c | 2 +- c_gui/GnomeKeyring.cs | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CASA.changes b/CASA.changes index af6c926b..79f5a190 100644 --- a/CASA.changes +++ b/CASA.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 16 07:45:20 IST 2006 - smanojna@novell.com + +- Bug 146015: A CASAkeyring is created to add secrets to the + Gnome Keyring through CASAManager - FIXED. + ------------------------------------------------------------------- Tue Feb 14 17:15:34 MST 2006 - jnorman@novell.com diff --git a/c_adlib/GKEngine.cs b/c_adlib/GKEngine.cs index 2e11531e..e2c9e907 100644 --- a/c_adlib/GKEngine.cs +++ b/c_adlib/GKEngine.cs @@ -113,7 +113,7 @@ namespace Novell.CASA.DataEngines { keyElem = doc.CreateElement(ConstStrings.CCF_KEY); keyIdAttr = doc.CreateAttribute(ConstStrings.CCF_ID); - keyIdAttr.Value = "GKPassword"; + keyIdAttr.Value = "password"; keyElem.SetAttributeNode(keyIdAttr); valueElem = doc.CreateElement(ConstStrings.CCF_VALUE); @@ -219,7 +219,7 @@ namespace Novell.CASA.DataEngines //Get the Key XmlAttributeCollection at = tuple.Attributes; String keyname = (at["ID"]).InnerText; - if (keyname.Equals("GKPassword")) + if (keyname.Equals("password")) { password = tuple.ChildNodes[0].InnerText; diff --git a/c_adlib/ad_gk/native/ad_gk.c b/c_adlib/ad_gk/native/ad_gk.c index 71f020cf..35ea6784 100644 --- a/c_adlib/ad_gk/native/ad_gk.c +++ b/c_adlib/ad_gk/native/ad_gk.c @@ -636,7 +636,7 @@ CreateItemInKeyring(char *keyring, int32_t itemType, char *display_name, char *s g_array_append_val (attributes, attribute); } - gnome_keyring_item_create(keyring,itemType,display_name,attributes,secret,FALSE,CreateItemCb,&cbData,NULL); + gnome_keyring_item_create(NULL,itemType,display_name,attributes,secret,FALSE,CreateItemCb,&cbData,NULL); gnome_keyring_attribute_list_free (attributes); g_main_loop_run (loop); return cbData.result; diff --git a/c_gui/GnomeKeyring.cs b/c_gui/GnomeKeyring.cs index d08f92e7..ea1fdd2b 100644 --- a/c_gui/GnomeKeyring.cs +++ b/c_gui/GnomeKeyring.cs @@ -752,7 +752,7 @@ public class GnomeKeyring : Store NativeValues[Common.INDEX_NATIVEINFO_SYNCTYPE] = null; NativeValues[Common.INDEX_NATIVEINFO_MODIFIEDTIME] = null; - iterSecret = tsSecretIDGnomeKeyring.AppendValues(entrySecretID.Text, Keys, Values, "CASAkeyring", NativeKeys, NativeValues); + iterSecret = tsSecretIDGnomeKeyring.AppendValues(entrySecretID.Text, Keys, Values, "default", NativeKeys, NativeValues); modelSecret = tvSecretIDGnomeKeyring.Model; if( Common.STATUS_SUCCESS == StoreDataInterface.UpdateStore(Common.STORE_GNOMEKEYRING, Common.OPERATION_ADD_SECRET, "", "", ref modelSecret, ref iterSecret) )