Author: locilka Date: Tue Jun 5 13:34:48 2007 New Revision: 38288 URL: http://svn.opensuse.org/viewcvs/yast?rev=38288&view=rev Log: - Removed SambaNmbLookup::GetAvailableNeighbours call because this feature has been dropped from samba-client (#240045). - 2.15.7 Modified: trunk/samba-server/VERSION trunk/samba-server/package/yast2-samba-server.changes trunk/samba-server/src/dialogs.ycp trunk/samba-server/yast2-samba-server.spec.in Modified: trunk/samba-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/VERSION?rev=38288&r1=38287&r2=38288&view=diff ============================================================================== --- trunk/samba-server/VERSION (original) +++ trunk/samba-server/VERSION Tue Jun 5 13:34:48 2007 @@ -1 +1 @@ -2.15.6 +2.15.7 Modified: trunk/samba-server/package/yast2-samba-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/package/yast2-samba-server.changes?rev=38288&r1=38287&r2=38288&view=diff ============================================================================== --- trunk/samba-server/package/yast2-samba-server.changes (original) +++ trunk/samba-server/package/yast2-samba-server.changes Tue Jun 5 13:34:48 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jun 5 13:32:13 CEST 2007 - locilka@suse.cz + +- Removed SambaNmbLookup::GetAvailableNeighbours call because this + feature has been dropped from samba-client (#240045). +- 2.15.7 + +------------------------------------------------------------------- Mon Apr 16 12:55:40 CEST 2007 - locilka@suse.cz - Added possibility to rename a share (#263302). Modified: trunk/samba-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/src/dialogs.ycp?rev=38288&r1=38287&r2=38288&view=diff ============================================================================== --- trunk/samba-server/src/dialogs.ycp (original) +++ trunk/samba-server/src/dialogs.ycp Tue Jun 5 13:34:48 2007 @@ -78,17 +78,23 @@ string caption = _("Samba Installation") + ": " + _("Step 1 of 2"); - list <string> workgroups = SambaNmbLookup::GetAvailableNeighbours(nil); + // feature dropped + // list <string> workgroups = SambaNmbLookup::GetAvailableNeighbours(nil); // always add the currently configured workgroup string workgroup = SambaConfig::GlobalGetStr("workgroup", ""); - if (size(workgroup) > 0 && !contains(workgroups, workgroup)) { - workgroups = add(workgroups, workgroup); - } +// if (size(workgroup) > 0 && !contains(workgroups, workgroup)) { +// workgroups = add(workgroups, workgroup); +// } term contents = `VBox ( `VSquash ( - `Left ( `ComboBox ( `id( "workgroups" ), `opt( `editable ), _("&Workgroup or Domain Name"), workgroups ) ) + `Left ( + // `ComboBox ( `id( "workgroups" ), `opt( `editable ), _("&Workgroup or Domain Name"), workgroups ) + + // TRANSLATORS: text entry + `TextEntry (`id ("workgroups"), _("&Workgroup or Domain Name"), workgroup) + ) ), `VStretch () ); @@ -833,11 +839,13 @@ term basesettings_widget = `Frame(_("Base Settings"), `HBox( `HSpacing(1), `VBox( - `ComboBox(`id("workgroup_domainname"), `opt(`editable, `hstretch), _("&Workgroup or Domain Name"), - SambaNmbLookup::GetAvailableNeighbours(nil)), + // `ComboBox(`id("workgroup_domainname"), `opt(`editable, `hstretch), _("&Workgroup or Domain Name"), + // SambaNmbLookup::GetAvailableNeighbours(nil)), + `TextEntry (`id("workgroup_domainname"), `opt(`editable, `hstretch), _("&Workgroup or Domain Name")), // translators: combobox label `ComboBox(`id("domain_controller"), `opt(`hstretch), _("Domain &Controller"), roles), - `VStretch()), + `VStretch() + ), `HSpacing(1))); term advanced_settings_widget = `MenuButton(_("Advanced Settings..."), [ Modified: trunk/samba-server/yast2-samba-server.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/yast2-samba-server.spec.in?rev=38288&r1=38287&r2=38288&view=diff ============================================================================== --- trunk/samba-server/yast2-samba-server.spec.in (original) +++ trunk/samba-server/yast2-samba-server.spec.in Tue Jun 5 13:34:48 2007 @@ -7,7 +7,7 @@ Requires: yast2 Requires: yast2-ldap-client Requires: yast2-perl-bindings -Requires: yast2-samba-client >= 2.15.3 +Requires: yast2-samba-client >= 2.15.7 Requires: yast2-users BuildArchitectures: noarch -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org