Bug 239984. Handle null in message on Preferences dialog

This commit is contained in:
Jim Norman 2007-01-30 06:59:21 +00:00
parent ebe3c485ec
commit 38451c07bc
2 changed files with 28 additions and 20 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Jan 30 11:40:17 MST 2007 - jnorman@novell.com
- Bug 239984. Handle null for message in Preferences dialog.
-------------------------------------------------------------------
Tue Jan 24 13:40:21 MST 2007 - cmashayekhi@novell.com
- Bug 238315. Scripts casacfgpam and casaucfgpam were fixed by

View File

@ -1845,16 +1845,19 @@ namespace Novell.CASA.GUI
if (!sNewDir.Equals(sOldDir))
{
string sMoveMessage = MoveMiCASAFiles(sOldDir, sNewDir);
if (sMoveMessage.Equals("Success"))
if (sMoveMessage != null)
{
// save off selected directory
Common.SetUserPersistentDir(config, sNewDir);
CommonGUI.DisplayMessage(Gtk.MessageType.Info, "Files moved from\r\n" + sOldDir + "\r\nto\r\n" + sNewDir);
}
else
{
CommonGUI.DisplayMessage(Gtk.MessageType.Warning, sMoveMessage);
bCloseDialog = false;
if (sMoveMessage.Equals("Success"))
{
// save off selected directory
Common.SetUserPersistentDir(config, sNewDir);
CommonGUI.DisplayMessage(Gtk.MessageType.Info, "Files moved from\r\n" + sOldDir + "\r\nto\r\n" + sNewDir);
}
else
{
CommonGUI.DisplayMessage(Gtk.MessageType.Warning, sMoveMessage);
bCloseDialog = false;
}
}
}
}