Author: aschnell Date: Tue Feb 14 11:41:44 2012 New Revision: 67425 URL: http://svn.opensuse.org/viewcvs/yast?rev=67425&view=rev Log: - use correct CloseDialog function Modified: trunk/s390/src/dasd/wizards.ycp trunk/s390/src/zfcp/wizards.ycp Modified: trunk/s390/src/dasd/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/wizards.ycp?rev=674... ============================================================================== --- trunk/s390/src/dasd/wizards.ycp (original) +++ trunk/s390/src/dasd/wizards.ycp Tue Feb 14 11:41:44 2012 @@ -6,9 +6,7 @@ * * $Id$ */ - { - textdomain "s390"; import "Sequencer"; @@ -16,14 +14,16 @@ include "s390/dasd/dialogs.ycp"; + /** * Whole configuration of controller * @return symbol MainDASDSequence */ -symbol MainDASDSequence () { +symbol MainDASDSequence() +{ map aliases = $[ - "main" : ``(DASDDialog ()), - "add" : ``(AddDASDDiskDialog ()) + "main" : ``(DASDDialog()), + "add" : ``(AddDASDDiskDialog()) ]; map sequence = $[ @@ -39,15 +39,16 @@ ], ]; - return Sequencer::Run (aliases, sequence); + return Sequencer::Run(aliases, sequence); } + /** * Whole configuration of controller * @return sequence result */ -any DASDSequence() { - +any DASDSequence() +{ map aliases = $[ "read" : [ ``( ReadDialog() ), true ], "main" : ``( MainDASDSequence() ), @@ -75,17 +76,19 @@ any ret = Sequencer::Run(aliases, sequence); - UI::CloseDialog(); + Wizard::CloseDialog(); + return ret; } + /** * Whole configuration of controller but without reading and writing. * For use with autoinstallation. * @return sequence result */ -any DASDAutoSequence() { - +any DASDAutoSequence() +{ /* Initialization dialog caption */ string caption = _("Controller Configuration"); /* Initialization dialog contents */ @@ -98,9 +101,9 @@ any ret = MainDASDSequence(); - UI::CloseDialog(); + Wizard::CloseDialog(); + return ret; } -/* EOF */ } Modified: trunk/s390/src/zfcp/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/wizards.ycp?rev=674... ============================================================================== --- trunk/s390/src/zfcp/wizards.ycp (original) +++ trunk/s390/src/zfcp/wizards.ycp Tue Feb 14 11:41:44 2012 @@ -6,9 +6,7 @@ * * $Id$ */ - { - textdomain "s390"; import "Sequencer"; @@ -16,14 +14,16 @@ include "s390/zfcp/dialogs.ycp"; + /** * Main dialog * @return symbol dialog */ -symbol MainZFCPSequence () { +symbol MainZFCPSequence() +{ map aliases = $[ - "main" : ``(ZFCPDialog ()), - "add" : ``(AddZFCPDiskDialog ()) + "main" : ``(ZFCPDialog()), + "add" : ``(AddZFCPDiskDialog()) ]; map sequence = $[ @@ -39,15 +39,16 @@ ], ]; - return Sequencer::Run (aliases, sequence); + return Sequencer::Run(aliases, sequence); } + /** * Whole configuration of controller * @return sequence result */ -any ZFCPSequence() { - +any ZFCPSequence() +{ map aliases = $[ "read" : [ ``( ReadDialog() ), true ], "main" : ``( MainZFCPSequence() ), @@ -75,17 +76,19 @@ any ret = Sequencer::Run(aliases, sequence); - UI::CloseDialog(); + Wizard::CloseDialog(); + return ret; } + /** * Whole configuration of controller but without reading and writing. * For use with autoinstallation. * @return sequence result */ -any ZFCPAutoSequence() { - +any ZFCPAutoSequence() +{ /* Initialization dialog caption */ string caption = _("Controller Configuration"); /* Initialization dialog contents */ @@ -98,9 +101,9 @@ any ret = MainZFCPSequence(); - UI::CloseDialog(); + Wizard::CloseDialog(); + return ret; } -/* EOF */ } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org