From 021e3b16e5f2bb5055bf1282037dcc88055fc2d9 Mon Sep 17 00:00:00 2001 From: smanojna Date: Thu, 4 May 2006 12:10:52 +0000 Subject: [PATCH] ------------------------------------------------------------------- Thu May 4 17:38:25 IST 2006 - smanojna@novell.com - Description: 1. Fixed Bug 170854: CASAGui only allows one edit at a time. 2. Added 512 character limit during the edit operation, i.e. the newly edited value string cannot be longer than 512. 3. Fixed a bug caused during deleting and adding new key-value pairs, this bug had not been filed in Bugzilla. -In the manage secret dialog, delete a key-value pair. -Add a new key with the same name as the one deleted above but but with a different value. -When you click the OK button the changes are not effected. - Modified files: c_gui/MiCasa.cs c_gui/Firefox.cs c_gui/GnomeKeyring.cs c_gui/KdeWallet.cs c_gui/Common.cs ------------------------------------------------------------------- --- CASA.changes | 21 +++++++++++++++++++++ c_gui/Common.cs | 3 ++- c_gui/Firefox.cs | 2 +- c_gui/GnomeKeyring.cs | 14 +++++++------- c_gui/KdeWallet.cs | 9 +++++---- c_gui/MiCasa.cs | 11 ++++++----- 6 files changed, 42 insertions(+), 18 deletions(-) diff --git a/CASA.changes b/CASA.changes index c9e15aaa..d8f6d3e2 100644 --- a/CASA.changes +++ b/CASA.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Thu May 4 17:38:25 IST 2006 - smanojna@novell.com + +- Description: + 1. Fixed Bug 170854: CASAGui only allows one edit at a time. + 2. Added 512 character limit during the edit operation, i.e. + the newly edited value string cannot be longer than 512. + 3. Fixed a bug caused during deleting and adding new key-value pairs, + this bug had not been filed in Bugzilla. + -In the manage secret dialog, delete a key-value pair. + -Add a new key with the same name as the one deleted above but + but with a different value. + -When you click the OK button the changes are not effected. + +- Modified files: + c_gui/MiCasa.cs + c_gui/Firefox.cs + c_gui/GnomeKeyring.cs + c_gui/KdeWallet.cs + c_gui/Common.cs + ------------------------------------------------------------------- Thu May 4 15:23:17 IST 2006 - smanojna@novell.com diff --git a/c_gui/Common.cs b/c_gui/Common.cs index c4f08e9c..780ae8fc 100644 --- a/c_gui/Common.cs +++ b/c_gui/Common.cs @@ -59,7 +59,8 @@ public class Common public static string GladeFile = null, DebugLogFile = null; - + public static int MAX_LEN = 512; + ///############################################################## /// SPI CONSTANTS /// diff --git a/c_gui/Firefox.cs b/c_gui/Firefox.cs index fbc67483..9725c5d0 100644 --- a/c_gui/Firefox.cs +++ b/c_gui/Firefox.cs @@ -323,7 +323,7 @@ public class Firefox : Store break; } } - AggregateStore(); + //AggregateStore(); } else Logger.DbgLog("GUI:Firefox.OnKeyValueEdited() - ERROR: STATUS_STORE_UPDATEFAILED"); diff --git a/c_gui/GnomeKeyring.cs b/c_gui/GnomeKeyring.cs index 80138723..2511078b 100644 --- a/c_gui/GnomeKeyring.cs +++ b/c_gui/GnomeKeyring.cs @@ -338,7 +338,7 @@ public class GnomeKeyring : Store if( false == entrySecretID.Editable ) { - if( ("" != args.NewText) && (KeyValue != args.NewText) ) + if( ("" != args.NewText) && (Common.MAX_LEN >= args.NewText.Length) && (KeyValue != args.NewText) ) if( Common.STATUS_SUCCESS == StoreDataInterface.UpdateStore(Common.STORE_GNOMEKEYRING, Common.OPERATION_MODIFY_KEY, KeyName, args.NewText, ref model, ref iter) ) { Logger.DbgLog("GUI:GnomeKeyring.OnKeyValueEdited() - StoreDataInterface.UpdateStore() succeeded"); @@ -358,7 +358,7 @@ public class GnomeKeyring : Store break; } } - AggregateStore(); + //AggregateStore(); } else Logger.DbgLog("GUI:GnomeKeyring.OnKeyValueEdited() - ERROR: STATUS_STORE_UPDATEFAILED"); @@ -584,8 +584,7 @@ public class GnomeKeyring : Store else Logger.DbgLog("GUI:GnomeKeyring.on_buttonManageOk_clicked() - DELETE_KEY_FAILED."); } - arrDeletedKeys.Clear(); - AggregateStore(); + arrDeletedKeys.Clear(); } if( tsKeyValue.GetIterFirst(out iterKey) && tvSecretIDGnomeKeyring.Selection.GetSelected (out modelSecret, out iterSecret) ) @@ -604,10 +603,11 @@ public class GnomeKeyring : Store Logger.DbgLog("GUI:GnomeKeyring.on_buttonManageOk_clicked() - ADD_KEY_VALUE_FAILED."); } } - while( tsKeyValue.IterNext(ref iterKey) ); - AggregateStore(); + while( tsKeyValue.IterNext(ref iterKey) ); } - } + AggregateStore(); + } + } catch(Exception exp) { diff --git a/c_gui/KdeWallet.cs b/c_gui/KdeWallet.cs index 332bf869..1dd9991b 100644 --- a/c_gui/KdeWallet.cs +++ b/c_gui/KdeWallet.cs @@ -338,7 +338,7 @@ public class KdeWallet : Store if( false == entrySecretID.Editable ) { - if( ("" != args.NewText) && (KeyValue != args.NewText) ) + if( ("" != args.NewText) && (Common.MAX_LEN >= args.NewText.Length) && (KeyValue != args.NewText) ) if( Common.STATUS_SUCCESS == StoreDataInterface.UpdateStore(Common.STORE_KDEWALLET, Common.OPERATION_MODIFY_KEY, KeyName, args.NewText, ref model, ref iter) ) { Logger.DbgLog("GUI:KdeWallet.OnKeyValueEdited() - StoreDataInterface.UpdateStore() succeeded"); @@ -358,7 +358,7 @@ public class KdeWallet : Store break; } } - AggregateStore(); + //AggregateStore(); } else Logger.DbgLog("GUI:KdeWallet.OnKeyValueEdited() - ERROR: STATUS_STORE_UPDATEFAILED"); @@ -586,7 +586,7 @@ public class KdeWallet : Store Logger.DbgLog("GUI:KdeWallet.on_buttonManageOk_clicked() - DELETE_KEY_FAILED."); } arrDeletedKeys.Clear(); - AggregateStore(); + } if( tsKeyValue.GetIterFirst(out iterKey) && tvSecretIDKdeWallet.Selection.GetSelected (out modelSecret, out iterSecret) ) @@ -606,8 +606,9 @@ public class KdeWallet : Store } } while( tsKeyValue.IterNext(ref iterKey) ); - AggregateStore(); + } + AggregateStore(); } } catch(Exception exp) diff --git a/c_gui/MiCasa.cs b/c_gui/MiCasa.cs index 0c970ce4..300a3675 100644 --- a/c_gui/MiCasa.cs +++ b/c_gui/MiCasa.cs @@ -287,7 +287,7 @@ public class MiCasa : Store cellEditable = new CellRendererText(); cellEditable.Editable = true; cellEditable.Edited += new EditedHandler(OnKeyValueEdited); - /// KEY:0 VALUE:1 VALUE-DUP:2 DIRTY-BIT:3 LINK:4 + /// KEY:0 VALUE:1 VALUE-DUP:2 DIRTY-BIT:3 LINK:4 tsKeyValue = new TreeStore(typeof(string),typeof(string), typeof(string), typeof(bool), typeof(string)); tvKeyValue.AppendColumn("Key",new CellRendererText(),"text",0); tvKeyValue.AppendColumn("Value",cellEditable,"text",2); @@ -364,7 +364,7 @@ public class MiCasa : Store if( false == entrySecretID.Editable ) { - if( ("" != args.NewText) && (KeyValue != args.NewText) ) + if( ("" != args.NewText) && (Common.MAX_LEN >= args.NewText.Length) && (KeyValue != args.NewText) ) if( Common.STATUS_SUCCESS == StoreDataInterface.UpdateStore(Common.STORE_MICASA, Common.OPERATION_MODIFY_KEY, KeyName, args.NewText, ref model, ref iter) ) { Logger.DbgLog("GUI:MiCasa.OnKeyValueEdited() - StoreDataInterface.UpdateStore() succeeded"); @@ -384,7 +384,7 @@ public class MiCasa : Store break; } } - AggregateStore(); + //AggregateStore(); } else Logger.DbgLog("GUI:MiCasa.OnKeyValueEdited() - ERROR: STATUS_STORE_UPDATEFAILED"); @@ -679,7 +679,7 @@ public class MiCasa : Store Logger.DbgLog("GUI:MiCasa.on_buttonManageOk_clicked() - DELETE_KEY_FAILED."); } arrDeletedKeys.Clear(); - AggregateStore(); + } if( tsKeyValue.GetIterFirst(out iterKey) && tvSecretIDMiCasa.Selection.GetSelected (out modelSecret, out iterSecret) ) @@ -699,8 +699,9 @@ public class MiCasa : Store } } while( tsKeyValue.IterNext(ref iterKey) ); - AggregateStore(); + } + AggregateStore(); } } catch(Exception exp)