Author: locilka Date: Fri Nov 20 13:16:44 2009 New Revision: 59657 URL: http://svn.opensuse.org/viewcvs/yast?rev=59657&view=rev Log: - Added description to the list of allowed services (FATE #306804). - 2.17.8 Modified: branches/SuSE-Code-11-SP1-Branch/firewall/package/yast2-firewall.changes branches/SuSE-Code-11-SP1-Branch/firewall/src/subdialogs.ycp branches/SuSE-Code-11-SP1-Branch/firewall/src/uifunctions.ycp branches/SuSE-Code-11-SP1-Branch/firewall/yast2-firewall.spec.in Modified: branches/SuSE-Code-11-SP1-Branch/firewall/package/yast2-firewall.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/firewall/package/yast2-firewall.changes?rev=59657&r1=59656&r2=59657&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/firewall/package/yast2-firewall.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/firewall/package/yast2-firewall.changes Fri Nov 20 13:16:44 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Nov 20 13:12:06 CET 2009 - locilka@suse.cz + +- Added description to the list of allowed services (FATE #306804). +- 2.17.8 + +------------------------------------------------------------------- Mon Jan 12 10:27:26 CET 2009 - locilka@suse.cz - A better sorting for allowed services and services to allow Modified: branches/SuSE-Code-11-SP1-Branch/firewall/src/subdialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/firewall/src/subdialogs.ycp?rev=59657&r1=59656&r2=59657&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/firewall/src/subdialogs.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/firewall/src/subdialogs.ycp Fri Nov 20 13:16:44 2009 @@ -210,7 +210,9 @@ `opt(`hstretch, `vstretch, `keepSorting), `header ( // TRANSLATORS: table header item - _("Allowed Service") + _("Allowed Service"), + // TRANSLATORS: table header item + _("Description") ), [] ), Modified: branches/SuSE-Code-11-SP1-Branch/firewall/src/uifunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/firewall/src/uifunctions.ycp?rev=59657&r1=59656&r2=59657&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/firewall/src/uifunctions.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/firewall/src/uifunctions.ycp Fri Nov 20 13:16:44 2009 @@ -687,7 +687,7 @@ } else { foreach (string service_name, string service_id, translations_to_service_ids, { if (SuSEFirewall::IsServiceSupportedInZone(service_id, current_zone)) { - allowed_services = add (allowed_services, `item(`id(service_id), service_name)); + allowed_services = add (allowed_services, `item(`id(service_id), service_name, SuSEFirewallServices::GetDescription(service_id))); } else { not_allowed_services = add (not_allowed_services, `item(`id(service_id), service_name)); } @@ -702,8 +702,6 @@ ``(tolower(x[1]:"a") <= tolower(y[1]:"b")) ); - y2milestone ("%1", not_allowed_services); - UI::ChangeWidget(`id("table_allowed_services"), `Items, allowed_services); UI::ReplaceWidget(`id("allow_service_names_replacepoint"), // TRANSLATORS: select box Modified: branches/SuSE-Code-11-SP1-Branch/firewall/yast2-firewall.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/firewall/yast2-firewall.spec.in?rev=59657&r1=59656&r2=59657&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/firewall/yast2-firewall.spec.in (original) +++ branches/SuSE-Code-11-SP1-Branch/firewall/yast2-firewall.spec.in Fri Nov 20 13:16:44 2009 @@ -4,8 +4,8 @@ BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite BuildRequires: yast2 >= 2.16.47 -# SuSEFirewall::SetInstallPackagesIfMissing, bnc #388773 -Requires: yast2 >= 2.17.6 +# SuSEFirewallServices::GetDescription +Requires: yast2 >= 2.17.76 # ButtonBox widget Conflicts: yast2-ycp-ui-bindings < 2.17.3 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org