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

fix bug the prevents UI from appearing

Browse Source
This commit is contained in:
Jim Norman 2008-05-29 15:43:08 +00:00
parent 75ef7bae4c
commit f644145b3d
2 changed files with 48 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CASA/CASA.changes
View File

@ -1,3 +1,7 @@
Thu May 29 09:38:53 MDT 2008 - jnorman@novell.com
- Fix bug that prevents CASAManager from displaying
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 11 11:38:53 MDT 2008 - jnorman@novell.com Mon May 11 11:38:53 MDT 2008 - jnorman@novell.com

89
CASA/gui/CasaMain.cs
View File

@ -114,29 +114,29 @@ namespace Novell.CASA.GUI
[Glade.Widget] [Glade.Widget]
Gtk.Button okbuttonPersistentStorage, Gtk.Button okbuttonPersistentStorage,
buttonChooseDirectory; buttonChooseDirectory;
[Glade.Widget] [Glade.Widget]
Gtk.MenuItem mmiNew, Gtk.MenuItem mmiNew,
mmiNewKey, mmiNewKey,
mmiImportSecrets, mmiImportSecrets,
mmiExportSecrets, mmiExportSecrets,
mmiView, mmiView,
mmiLink, mmiLink,
mmiCopy, mmiCopy,
mmiDelete, mmiDelete,
mmiRefresh, mmiRefresh,
mmiLockSecrets, mmiLockSecrets,
mmiUnlockSecrets, mmiUnlockSecrets,
mmiDestroySecrets, mmiDestroySecrets,
mmiEdit, mmiEdit,
mmiOptions, mmiOptions,
mmiDebug, mmiDebug,
mmiApplicationSSO, mmiApplicationSSO,
mmiKonquerer, mmiKonquerer,
mmiKopete, mmiKopete,
mmiNetworkManager, mmiNetworkManager,
mmiGaim, mmiGaim,
mmiChangeMP; mmiChangeMP;
[Glade.Widget] [Glade.Widget]
@ -366,15 +366,15 @@ namespace Novell.CASA.GUI
else else
(notebookStores.GetNthPage(Common.STORE_GNOMEKEYRING)).Visible = Common.IS_GNOMEKEYRING; (notebookStores.GetNthPage(Common.STORE_GNOMEKEYRING)).Visible = Common.IS_GNOMEKEYRING;
notebookStores.CurrentPage = Common.STORE_MICASA; notebookStores.CurrentPage = Common.STORE_MICASA;
if (CommonGUI.UseMasterPassword()) if (CommonGUI.UseMasterPassword())
{ {
mmiChangeMP.Visible = true; mmiChangeMP.Visible = true;
} }
else else
{ {
mmiChangeMP.Visible = false; mmiChangeMP.Visible = false;
} }
@ -404,12 +404,11 @@ namespace Novell.CASA.GUI
{ {
Glade.XML gxmlTemp = new Glade.XML(Common.GladeFile, "dialogDesktopPassword", null); Glade.XML gxmlTemp = new Glade.XML(Common.GladeFile, "dialogDesktopPassword", null);
gxmlTemp.Autoconnect(this); gxmlTemp.Autoconnect(this);
return;
} }
} }
else
{ InitializeGUI();
InitializeGUI();
}
} }
/// <summary> /// <summary>
@ -509,15 +508,15 @@ namespace Novell.CASA.GUI
} }
if (dialogDesktopPassword != null) if (dialogDesktopPassword != null)
dialogDesktopPassword.Destroy(); dialogDesktopPassword.Destroy();
if (CommonGUI.UseMasterPassword()) if (CommonGUI.UseMasterPassword())
{ {
MasterPasswordAuthentication(); MasterPasswordAuthentication();
} }
else else
{ {
InitializeGUI(); InitializeGUI();
} }
} }
else else