[yast-commit] r52282 - in /trunk/printer: VERSION package/yast2-printer.changes src/printer_proposal.ycp
![](https://seccdn.libravatar.org/avatar/38b487cbaff3eee1e7a74ac7b3d2ed23.jpg?s=120&d=mm&r=g)
Author: jsrain Date: Thu Oct 16 12:32:06 2008 New Revision: 52282 URL: http://svn.opensuse.org/viewcvs/yast?rev=52282&view=rev Log: fixed printer proposal (bnc #431559) Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/printer_proposal.ycp Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=52282&r1=52281&r2=52282&view=diff ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Thu Oct 16 12:32:06 2008 @@ -1 +1 @@ -2.17.21 +2.17.22 Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.changes?rev=52282&r1=52281&r2=52282&view=diff ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Thu Oct 16 12:32:06 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Oct 16 12:12:23 CEST 2008 - jsrain@suse.cz + +- fixed printer proposal (bnc #431559) +- 2.17.22 + +------------------------------------------------------------------- Mon Oct 13 17:01:55 CEST 2008 - mzugec@suse.cz - fixed Connection Wizard Modified: trunk/printer/src/printer_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/printer_proposal.ycp?rev=52282&r1=52281&r2=52282&view=diff ============================================================================== --- trunk/printer/src/printer_proposal.ycp (original) +++ trunk/printer/src/printer_proposal.ycp Thu Oct 16 12:32:06 2008 @@ -47,7 +47,7 @@ /* create a textual proposal */ if(func == "MakeProposal") { - string proposal = ""; + list<string> proposal = []; string warning = nil; symbol warning_level = nil; boolean force_reset = param["force_reset"]:false; @@ -58,11 +58,17 @@ Printer::Read(); Progress::set (progress_orig); } - list sum = Printer::QueueItems( true, true ); - proposal = sum[0]:""; + + proposal = maplist ( map< string, string > queue, Printer::queues, { + string description = queue["description"]:""; + return description; + }); + proposal = filter (string p, proposal, { return p != ""; }); + if (size (proposal) == 0) + proposal = [ _("No printer queue configured.") ]; ret = $[ - "preformatted_proposal" : proposal, + "raw_proposal" : proposal, "warning_level" : warning_level, "warning" : warning, ]; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
jsrain@svn.opensuse.org