Author: jsuchome Date: Wed Jan 21 10:09:53 2009 New Revision: 54846 URL: http://svn.opensuse.org/viewcvs/yast?rev=54846&view=rev Log: - removed progress dialog during read (bnc#447584) Modified: trunk/security/package/yast2-security.changes trunk/security/src/Security.ycp trunk/security/src/complex.ycp trunk/security/src/wizards.ycp Modified: trunk/security/package/yast2-security.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/package/yast2-security.changes?rev=54846&r1=54845&r2=54846&view=diff ============================================================================== --- trunk/security/package/yast2-security.changes (original) +++ trunk/security/package/yast2-security.changes Wed Jan 21 10:09:53 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Jan 21 10:09:02 CET 2009 - jsuchome@suse.cz + +- removed progress dialog during read (bnc#447584) + +------------------------------------------------------------------- Fri Nov 28 13:29:35 CET 2008 - ug@suse.de - conflict in rnc file fixed Modified: trunk/security/src/Security.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/src/Security.ycp?rev=54846&r1=54845&r2=54846&view=diff ============================================================================== --- trunk/security/src/Security.ycp (original) +++ trunk/security/src/Security.ycp Wed Jan 21 10:09:53 2009 @@ -327,39 +327,9 @@ */ global define boolean Read() { - /* Security read dialog caption */ - string caption = _("Initializing Security Configuration"); - integer steps = 3; - - integer sl = 0*1000; - sleep(sl); - - Progress::New( caption, " ", steps, [ - /* Progress stage 1/3 */ - _("Read security settings"), - /* Progress stage 2/3 */ - _("Read inittab settings"), - /* Progress stage 3/3 */ - _("Read PAM settings"), - ], [ - /* Progress step 1/4 */ - _("Reading security settings..."), - /* Progress step 2/4 */ - _("Reading inittab settings..."), - /* Progress step 3/4 */ - _("Reading PAM settings..."), - /* Progress step 4/4 */ - _("Finished") - ], - "" - ); - Settings = $[]; /* Read security settings */ - sleep(sl); - if(Abort()) return false; - Progress::NextStage(); mapmap(string file, list<string> vars, Locations, { maplist(string var, vars, { @@ -382,11 +352,6 @@ }); y2debug("Settings=%1", Settings); - /* Read inittab settings */ - sleep(sl); - if(Abort()) return false; - Progress::NextStage(); - list inittab = SCR::Dir(.etc.inittab); if(contains(inittab, "ca")) { string ca = (string) SCR::Read(.etc.inittab.ca); @@ -406,14 +371,12 @@ y2debug("Settings=%1", Settings); - /* Read pam settings */ - sleep(sl); - if(Abort()) return false; - Progress::NextStage(); /* Read runlevel setting */ ReadServiceSettings(); + /* Read pam settings */ + /* pam stuff */ map pwcheck = Pam::Query ("pwcheck"); list<string> pam_check_settings = pwcheck["password"]:[]; @@ -454,9 +417,6 @@ y2debug("Settings=%1", Settings); /* Local permissions hack */ - sleep(sl); - if(Abort()) return false; - Progress::NextStage(); string perm = Settings["PERMISSION_SECURITY"]:""; if(issubstring(perm, "easy")) perm = "easy"; @@ -466,8 +426,6 @@ Settings["PERMISSION_SECURITY"] = perm; y2debug("Settings=%1", Settings); - sleep(sl); - if(Abort()) return false; modified = false; // remeber the read values Modified: trunk/security/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/src/complex.ycp?rev=54846&r1=54845&r2=54846&view=diff ============================================================================== --- trunk/security/src/complex.ycp (original) +++ trunk/security/src/complex.ycp Wed Jan 21 10:09:53 2009 @@ -20,18 +20,6 @@ include "security/routines.ycp"; include "security/dialogs.ycp"; -/** - * Read settings dialog - * @return `next if success, else `abort - */ -define symbol ReadDialog() ``{ - - Wizard::RestoreHelp(HELPS["read"]:""); -// Security::AbortFunction = ``{return true;}; - Security::AbortFunction = ``{return Security::PollAbort();}; - boolean ret = Security::Read(); - return ret ? `next : `abort; -} /** * Write settings dialog Modified: trunk/security/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/src/wizards.ycp?rev=54846&r1=54845&r2=54846&view=diff ============================================================================== --- trunk/security/src/wizards.ycp (original) +++ trunk/security/src/wizards.ycp Wed Jan 21 10:09:53 2009 @@ -146,17 +146,12 @@ define any SecuritySequence() ``{ map aliases = $[ - "read" : [ ``( ReadDialog() ), true ], "main" : ``( TreeDialog() ), "write" : [ ``( WriteDialog() ), true ] ]; map sequence = $[ - "ws_start" : "read", - "read" : $[ - `abort : `abort, - `next : "main" - ], + "ws_start" : "main", "main" : $[ `abort : `abort, `finish : "write", @@ -170,6 +165,10 @@ Wizard::CreateDialog(); Wizard::SetDesktopIcon("security"); + + // Read has no progress and returns only true + Security::Read(); + any ret = Sequencer::Run(aliases, sequence); UI::CloseDialog(); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org