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

Roll back 171135.

Browse Source 
Partial fix 169353.
This commit is contained in:
Jim Norman 2006-05-03 22:38:44 +00:00
parent 55bfaf28c8
commit bea3c5ca77
2 changed files with 56 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
c_gui/CasaMain.cs
View File

@ -179,14 +179,16 @@ namespace Novell.CASA.GUI
}
else
{
if (Common.IS_LINUX)
// NOTE: Until we can figure out how to run YAST as root from here.
//if (Common.IS_LINUX)
if (false)
{
message = "CASA services are not available.\r\n\r\nConfigure CASA using YAST?";
buttonType = Gtk.ButtonsType.YesNo;
}
else
{
message = "CASA services are not available";
message = "CASA services are not available.\r\n\r\nPlease contact your adminstrator to configure CASA.";
}
}
@ -416,6 +418,10 @@ namespace Novell.CASA.GUI
}
if (entryDesktopPassword1.Text.Equals(entryDesktopPassword2.Text))
{
// validate entered desktop password
if (miCASA.ValidateDesktopPwd(entryDesktopPassword1.Text))
{
// set the desktop password in micasa
try
@ -427,6 +433,7 @@ namespace Novell.CASA.GUI
GetLocalUsername(),
entryDesktopPassword1.Text);
}
catch (Exception e)
{
Logger.DbgLog(e.ToString());
@ -438,6 +445,11 @@ namespace Novell.CASA.GUI
MasterPasswordAuthentication();
}
else
{
labelDesktopPasswordMessage.Text = "Your desktop password does not match";
}
}
else
{
labelDesktopPasswordMessage.Text = "Passwords do not match";
entryDesktopPassword1.Text = "";

25
c_gui/images/casa.glade
View File

@ -7841,6 +7841,31 @@ prompted for the Master Password at startup.</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="labelDesktopPasswordMessage">
<property name="visible">True</property>
<property name="label" translatable="yes"></property>
<property name="use_underline">True</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkFrame" id="frame20">
<property name="border_width">6</property>