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

Bug 239984. Handle null in message on Preferences dialog

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CASA/CASA.changes
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 Tue Jan 24 13:40:21 MST 2007 - cmashayekhi@novell.com
- Bug 238315. Scripts casacfgpam and casaucfgpam were fixed by - Bug 238315. Scripts casacfgpam and casaucfgpam were fixed by

43
CASA/gui/CasaMain.cs
View File

@ -1841,21 +1841,24 @@ namespace Novell.CASA.GUI
string sNewDir = entryStorageDirectory.Text; string sNewDir = entryStorageDirectory.Text;
string sOldDir = Common.GetUserPersistentDir(config); string sOldDir = Common.GetUserPersistentDir(config);
try try
{ {
if (!sNewDir.Equals(sOldDir)) if (!sNewDir.Equals(sOldDir))
{ {
string sMoveMessage = MoveMiCASAFiles(sOldDir, sNewDir); string sMoveMessage = MoveMiCASAFiles(sOldDir, sNewDir);
if (sMoveMessage.Equals("Success")) if (sMoveMessage != null)
{ {
// save off selected directory if (sMoveMessage.Equals("Success"))
Common.SetUserPersistentDir(config, sNewDir); {
CommonGUI.DisplayMessage(Gtk.MessageType.Info, "Files moved from\r\n" + sOldDir + "\r\nto\r\n" + sNewDir); // save off selected directory
} Common.SetUserPersistentDir(config, sNewDir);
else CommonGUI.DisplayMessage(Gtk.MessageType.Info, "Files moved from\r\n" + sOldDir + "\r\nto\r\n" + sNewDir);
{ }
CommonGUI.DisplayMessage(Gtk.MessageType.Warning, sMoveMessage); else
bCloseDialog = false; {
} CommonGUI.DisplayMessage(Gtk.MessageType.Warning, sMoveMessage);
bCloseDialog = false;
}
}
} }
} }
catch (Exception e) catch (Exception e)
@ -2188,11 +2191,11 @@ namespace Novell.CASA.GUI
} }
public void on_importSecrets_activate(object obj, EventArgs args) public void on_importSecrets_activate(object obj, EventArgs args)
{ {
if (objMiCasa != null) if (objMiCasa != null)
{ {
objMiCasa.DoFileImport(config); objMiCasa.DoFileImport(config);
objMiCasa.AggregateStore(); objMiCasa.AggregateStore();
} }
} }