Author: varkoly Date: Wed Jan 27 12:51:43 2010 New Revision: 60548 URL: http://svn.opensuse.org/viewcvs/yast?rev=60548&view=rev Log: Apply jsuchomes changes from bnc#559145 Export and Import smtp_use_TLS Modified: trunk/mail/src/Mail.ycp Modified: trunk/mail/src/Mail.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/Mail.ycp?rev=60548&r1=60547&r2=60548&view=diff ============================================================================== --- trunk/mail/src/Mail.ycp (original) +++ trunk/mail/src/Mail.ycp Wed Jan 27 12:51:43 2010 @@ -630,6 +630,14 @@ } /** + * Wrapper for global Read function, without the callback argument + */ + global boolean ReadWithoutCallback () { + block<boolean> abort_block = ``{ return false; }; + return Read (abort_block); + } + + /** * Make up data for screnshots */ global define void Fake () ``{ @@ -676,7 +684,7 @@ * Part of Write. * @return success */ - define boolean WriteGeneral () ``{ + global define boolean WriteGeneral () ``{ // create_config // if the user wanted it false, we did not proceed SCR::Write (.sysconfig.mail.MAIL_CREATE_CONFIG, "yes"); @@ -811,7 +819,7 @@ * Part of Write. * @return success */ - define boolean WriteMasquerading () ``{ + global define boolean WriteMasquerading () ``{ // from_header SCR::Write (.sysconfig.mail.FROM_HEADER, from_header); // masquerade_other_domains @@ -857,7 +865,7 @@ * Part of Write. * @return success */ - define boolean WriteDownloading () ``{ + global define boolean WriteDownloading () ``{ // fetchmail // TODO ?other settings: autofetch? at device up? SCR::Write (.mail.fetchmail.accounts, fetchmail); @@ -883,7 +891,7 @@ * Part of Write. * @return success */ - define boolean WriteAliasesAndVirtual () ``{ + global define boolean WriteAliasesAndVirtual () ``{ // aliases if (! MailAliases::WriteAliases ()) { @@ -916,7 +924,7 @@ * Part of Write. * @return success */ - define boolean WriteSmtpAuth () ``{ + global define boolean WriteSmtpAuth () ``{ // TODO how to remove the only entry? // filter it out in the dialog? if (enable_smtp_auth != nil) @@ -950,7 +958,7 @@ * Part of Write. * @return success */ - define boolean WriteFlush () ``{ + global define boolean WriteFlush () ``{ //flush the agents map<string, path> paths = $[ "/etc/sysconfig/mail": .sysconfig.mail, @@ -1008,7 +1016,7 @@ * Part of Write. * @return success */ - define boolean WriteSuSEconfig () ``{ + global define boolean WriteSuSEconfig () ``{ //run SuSEconfig with the necessary modules // TODO other modules using FROM_HEADER? integer ret = 0; @@ -1040,7 +1048,7 @@ * Part of Write. * @return success */ - define boolean WriteServices () ``{ + global define boolean WriteServices () ``{ if (amavis_service) { Service::Stop ("amavis"); @@ -1161,6 +1169,13 @@ return true; } + /** + * Wrapper for global Write function, without the callback argument + */ + global boolean WriteWithoutCallback () { + block<boolean> abort_block = ``{ return false; }; + return Write (abort_block); + } /** * Get all mail settings from the first parameter @@ -1218,6 +1233,7 @@ MailAliases::FilterRootAlias (); // MailAliases::merge_aliases = settings["merge_aliases"]: false; virtual_users = settings["virtual_users"]: []; + smtp_use_TLS = settings["smtp_use_TLS"]: "yes"; smtp_auth = settings["smtp_auth"]: []; y2debug ("after %1", settings); // may contain passwords return true; @@ -1245,6 +1261,7 @@ // "merge_aliases": MailAliases::merge_aliases, "virtual_users": virtual_users, "smtp_auth": smtp_auth, + "smtp_use_TLS": smtp_use_TLS, ]; if (mta == `postfix) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org