Author: jsmeix Date: Tue Aug 4 14:22:29 2009 New Revision: 58272 URL: http://svn.opensuse.org/viewcvs/yast?rev=58272&view=rev Log: In Printerlib::WaitForUpdatedConfigFiles replaced bumbling message "It takes 31 seconds until the config files are updated..." with "It takes half a minute until the config files are updated..." Modified: trunk/printer/src/Printerlib.ycp Modified: trunk/printer/src/Printerlib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/Printerlib.ycp?rev=58272&r1=58271&r2=58272&view=diff ============================================================================== --- trunk/printer/src/Printerlib.ycp (original) +++ trunk/printer/src/Printerlib.ycp Tue Aug 4 14:22:29 2009 @@ -547,8 +547,8 @@ sleep( 1000 ); return true; } - if( dirty_clean_interval < 31 ) - { // If 1 <= dirty_clean_interval <= 30 (30 is the default and fallback value) + if( dirty_clean_interval < 29 ) + { // If 1 <= dirty_clean_interval <= 28 // do not let the user interrupt the waiting for updated config files. // To be on the safe side sleep one second longer than the dirty_clean_interval: Popup::ShowFeedback( popupheader, @@ -564,6 +564,18 @@ Popup::ClearFeedback(); return true; } + if( dirty_clean_interval < 31 ) + { // If 29 <= dirty_clean_interval <= 30 (30 is the default and fallback value) + // do not let the user interrupt the waiting for updated config files. + // To be on the safe side sleep one second longer than the dirty_clean_interval: + Popup::ShowFeedback( popupheader, + // Message of a Popup::ShowFeedback. + _("It takes half a minute until the config files are updated...") + ); + sleep( ( 1000 * dirty_clean_interval ) + 1000 ); + Popup::ClearFeedback(); + return true; + } // If dirty_clean_interval > 30 let the user interrupt the waiting for updated config files // and return true if the user did not interrupt the waiting for updated config files // but return false if the user interrupted the waiting for updated config files. -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org