geos_one/CASA
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Handle import Conflict when file is encrypted.

Browse Source
This commit is contained in:
Jim Norman 2006-11-10 06:10:01 +00:00
parent afed5195bb
commit 4f53c776c9
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
CASA/gui/ImportSecrets.cs
View File

@ -184,12 +184,24 @@ namespace Novell.CASA.GUI
if (m_objMiCasa != null) if (m_objMiCasa != null)
{ {
m_objMiCasa.AggregateStore(); m_objMiCasa.AggregateStore();
} }
if (addSecrets.GetStatus().Equals("Success")) // check for conflicts
CommonGUI.DisplayMessage(Gtk.MessageType.Info, "Import complete"); if (m_ss == null)
else m_ss = SecretStore.getInstance();
CommonGUI.DisplayMessage(Gtk.MessageType.Info, "Failed: " + addSecrets.GetStatus());
m_scConflicts = m_ss.enumerateSecretIDs(SecretStore.SSCS_CONFLICT_KEYCHAIN);
if (m_scConflicts.Count > 0)
{
HandleConficts(m_ss, m_scConflicts);
}
else
{
if (addSecrets.GetStatus().Equals("Success"))
CommonGUI.DisplayMessage(Gtk.MessageType.Info, "Import complete");
else
CommonGUI.DisplayMessage(Gtk.MessageType.Info, "Failed: " + addSecrets.GetStatus());
}
} }
} }