Mailinglist Archive: opensuse-commit (1116 mails)
| < Previous | Next > |
commit yast2-network for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Wed, 11 Feb 2009 16:17:36 +0100
- Message-id: <20090211151736.8B1F66780B0@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package yast2-network for openSUSE:Factory
checked in at Wed Feb 11 16:17:36 CET 2009.
--------
--- yast2-network/yast2-network.changes 2009-01-26 14:16:02.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes
2009-02-11 15:26:40.000000000 +0100
@@ -1,0 +2,18 @@
+Wed Feb 11 15:19:27 CET 2009 - mzugec@xxxxxxx
+
+- store qeth options (bnc#474276)
+- 2.18.3
+
+-------------------------------------------------------------------
+Mon Feb 2 15:11:27 CET 2009 - kmachalkova@xxxxxxx
+
+- Read/write Host::write_hostname variable by Host module only,
+ override in inst_hostname if applicable (bnc#469752)
+
+-------------------------------------------------------------------
+Thu Jan 29 11:59:48 CET 2009 - kmachalkova@xxxxxxx
+
+- Proxy finish popup is back - notify user about the need to relogin
+ to apply new settings (bnc#458708)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-network-2.18.2.tar.bz2
New:
----
yast2-network-2.18.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.w11283/_old 2009-02-11 16:17:07.000000000 +0100
+++ /var/tmp/diff_new_pack.w11283/_new 2009-02-11 16:17:07.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-network (Version 2.18.2)
+# spec file for package yast2-network (Version 2.18.3)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-network
-Version: 2.18.2
-Release: 2
+Version: 2.18.3
+Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.18.2.tar.bz2
+Source0: yast2-network-2.18.3.tar.bz2
Prefix: /usr
# should be required by devtools
BuildRequires: perl-XML-Writer pkgconfig rpm
@@ -33,8 +33,9 @@
BuildRequires: yast2-country
BuildRequires: yast2-installation >= 2.15.27
BuildRequires: yast2 >= 2.16.6
-# needed for prefixlen support in aliases
-Requires: yast2 >= 2.17.5
+# network needs Wizard::OpenCancelOKDialog()
+# function from yast2-2.18.2
+Requires: yast2 >= 2.18.2
#netconfig (FaTE #303618)
Requires: sysconfig >= 0.71.2
#GetLanguageCountry
@@ -77,7 +78,7 @@
Michal Svec <msvec@xxxxxxx>
%prep
-%setup -n yast2-network-2.18.2
+%setup -n yast2-network-2.18.3
%build
%{prefix}/bin/y2tool y2autoconf
@@ -141,6 +142,15 @@
%exclude %{prefix}/share/doc/packages/yast2-network/COPYING
%exclude %{prefix}/share/doc/packages/yast2-network/README
%changelog
+* Wed Feb 11 2009 mzugec@xxxxxxx
+- store qeth options (bnc#474276)
+- 2.18.3
+* Mon Feb 02 2009 kmachalkova@xxxxxxx
+- Read/write Host::write_hostname variable by Host module only,
+ override in inst_hostname if applicable (bnc#469752)
+* Thu Jan 29 2009 kmachalkova@xxxxxxx
+- Proxy finish popup is back - notify user about the need to relogin
+ to apply new settings (bnc#458708)
* Mon Jan 26 2009 mzugec@xxxxxxx
- lan : button labeling (bnc#440551)
* Mon Jan 26 2009 mzugec@xxxxxxx
++++++ yast2-network-2.18.2.tar.bz2 -> yast2-network-2.18.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.18.2/src/dsl/complex.ycp
new/yast2-network-2.18.3/src/dsl/complex.ycp
--- old/yast2-network-2.18.2/src/dsl/complex.ycp 2008-11-20
15:08:50.000000000 +0100
+++ new/yast2-network-2.18.3/src/dsl/complex.ycp 2009-01-26
12:23:51.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Summary, overview and IO dialogs for DSL configuration.
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: complex.ycp 51338 2008-09-19 15:52:56Z mzugec $
+ * $Id: complex.ycp 54990 2009-01-26 11:23:51Z mzugec $
*/
{
@@ -349,7 +349,7 @@
"widget_descr": widget_descr,
"contents": `VBox("tab"),
"caption": caption,
- "back_button": Label::BackButton(),
+ "back_button": nil,
// #182853
"next_button": Label::OKButton(),
"abort_button": Label::CancelButton(),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.18.2/src/dsl/wizards.ycp
new/yast2-network-2.18.3/src/dsl/wizards.ycp
--- old/yast2-network-2.18.2/src/dsl/wizards.ycp 2008-01-24
14:41:27.000000000 +0100
+++ new/yast2-network-2.18.3/src/dsl/wizards.ycp 2009-01-26
12:23:51.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: DSL configuration wizards
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: wizards.ycp 36830 2007-03-09 15:02:19Z mzugec $
+ * $Id: wizards.ycp 54990 2009-01-26 11:23:51Z mzugec $
*/
{
@@ -287,7 +287,7 @@
*/
];
- Wizard::CreateDialog();
+ Wizard::OpenCancelOKDialog();
Wizard::SetDesktopIcon("dsl");
symbol ret = Sequencer::Run(aliases, sequence);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/yast2-network-2.18.2/src/installation/inst_hostname.ycp
new/yast2-network-2.18.3/src/installation/inst_hostname.ycp
--- old/yast2-network-2.18.2/src/installation/inst_hostname.ycp 2008-08-15
16:29:18.000000000 +0200
+++ new/yast2-network-2.18.3/src/installation/inst_hostname.ycp 2009-02-10
11:00:37.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Mandatory hostname configuration
* Authors: Martin Vidner <mvidner@xxxxxxx>
*
- * $Id: inst_hostname.ycp 50127 2008-08-15 14:29:18Z mzugec $
+ * $Id: inst_hostname.ycp 55189 2009-02-02 13:58:15Z kmachalkova $
*/
{
@@ -31,9 +31,6 @@
// FaTe#303875: Introduce a switch regarding 127.0.0.2 entry in /etc/hosts
boolean whth = ProductFeatures::GetBooleanFeature ("globals",
"write_hostname_to_hosts");
y2milestone("write_hostname_to_hosts value from control.xml : %1", whth);
-SCR::Write(.sysconfig.network.dhcp."WRITE_HOSTNAME_TO_HOSTS", whth ? "yes" :
"no");
-SCR::Write(.sysconfig.network.dhcp, nil);
-
DNS::Read (); // handles NetworkConfig too
@@ -45,6 +42,8 @@
// propose settings
NetworkConfig::DHCP["DHCLIENT_SET_HOSTNAME"] = ! Arch::is_laptop ();
+// override with setting from control.xml
+Host::SetWriteHostname( whth );
// TODO: policy for proposing a hostname
symbol ret = `next;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.18.2/src/isdn/wizards.ycp
new/yast2-network-2.18.3/src/isdn/wizards.ycp
--- old/yast2-network-2.18.2/src/isdn/wizards.ycp 2008-01-24
14:41:27.000000000 +0100
+++ new/yast2-network-2.18.3/src/isdn/wizards.ycp 2009-01-26
10:43:08.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: ISDN configuration wizards
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: wizards.ycp 24671 2005-08-05 11:03:16Z mvidner $
+ * $Id: wizards.ycp 54988 2009-01-26 09:43:07Z mzugec $
*/
{
@@ -123,7 +123,7 @@
// ]
];
- Wizard::CreateDialog();
+ Wizard::OpenCancelOKDialog();
Wizard::SetDesktopIcon("isdn");
symbol ret = Sequencer::Run(aliases, sequence);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.18.2/src/lan/complex.ycp
new/yast2-network-2.18.3/src/lan/complex.ycp
--- old/yast2-network-2.18.2/src/lan/complex.ycp 2008-11-14
13:14:43.000000000 +0100
+++ new/yast2-network-2.18.3/src/lan/complex.ycp 2009-01-26
13:30:57.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Summary, overview and IO dialogs for network cards config
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: complex.ycp 53181 2008-11-11 16:24:40Z kmachalkova $
+ * $Id: complex.ycp 54998 2009-01-26 12:30:56Z mzugec $
*/
{
@@ -468,8 +468,10 @@
contents = CWM::PrepareDialog(contents, w);
Wizard::SetContentsButtons(caption, contents, help, Label::BackButton (),
Label::OKButton ());
- Wizard::DisableBackButton();
+ Wizard::SetNextButton(`next, Label::OKButton());
Wizard::SetAbortButton(`abort, Label::CancelButton());
+ Wizard::HideBackButton();
+
symbol ret = CWM::Run(w, $[`abort:ReallyAbort ]);
return ret;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.18.2/src/lan/wizards.ycp
new/yast2-network-2.18.3/src/lan/wizards.ycp
--- old/yast2-network-2.18.2/src/lan/wizards.ycp 2008-10-06
11:14:48.000000000 +0200
+++ new/yast2-network-2.18.3/src/lan/wizards.ycp 2009-01-26
13:30:57.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Network cards configuration wizards
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: wizards.ycp 51843 2008-10-04 09:36:36Z mzugec $
+ * $Id: wizards.ycp 54998 2009-01-26 12:30:56Z mzugec $
*/
{
@@ -64,7 +64,7 @@
]
];
- Wizard::CreateDialog();
+ Wizard::OpenCancelOKDialog();
Wizard::SetDesktopIcon("lan");
symbol ret = Sequencer::Run(aliases, sequence);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.18.2/src/modem/complex.ycp
new/yast2-network-2.18.3/src/modem/complex.ycp
--- old/yast2-network-2.18.2/src/modem/complex.ycp 2008-11-14
13:14:43.000000000 +0100
+++ new/yast2-network-2.18.3/src/modem/complex.ycp 2009-01-26
10:53:41.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Summary, overview and IO dialogs for modems configuration.
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: complex.ycp 53227 2008-11-12 15:55:11Z mzugec $
+ * $Id: complex.ycp 54989 2009-01-26 09:53:41Z mzugec $
*/
{
@@ -372,7 +372,7 @@
"widget_descr": widget_descr,
"contents": `VBox("tab"),
"caption": caption,
- "back_button": Label::BackButton(),
+ "back_button": nil,
// #182853
"next_button": Label::OKButton(),
"abort_button": Label::CancelButton(),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.18.2/src/modem/wizards.ycp
new/yast2-network-2.18.3/src/modem/wizards.ycp
--- old/yast2-network-2.18.2/src/modem/wizards.ycp 2008-01-24
14:41:27.000000000 +0100
+++ new/yast2-network-2.18.3/src/modem/wizards.ycp 2009-01-26
10:53:41.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Modem configuration wizards
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: wizards.ycp 36830 2007-03-09 15:02:19Z mzugec $
+ * $Id: wizards.ycp 54989 2009-01-26 09:53:41Z mzugec $
*/
{
@@ -287,7 +287,7 @@
*/
];
- Wizard::CreateDialog();
+ Wizard::OpenCancelOKDialog();
Wizard::SetDesktopIcon("modem");
symbol ret = Sequencer::Run(aliases, sequence);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.18.2/src/modules/DNS.ycp
new/yast2-network-2.18.3/src/modules/DNS.ycp
--- old/yast2-network-2.18.2/src/modules/DNS.ycp 2008-11-28
12:38:23.000000000 +0100
+++ new/yast2-network-2.18.3/src/modules/DNS.ycp 2009-02-10
11:00:37.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Hostname and DNS data
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: DNS.ycp 53533 2008-11-21 17:48:37Z kmachalkova $
+ * $Id: DNS.ycp 55189 2009-02-02 13:58:15Z kmachalkova $
*
* Manages resolv.conf and (fully qualified) hostname, also
* respecting DHCP.
@@ -125,8 +125,12 @@
if(initialized == true) return true;
- Host::Read();
+ //in this order, because Host:;write hostname gets initialized from
NetworkConfig::DHCP
NetworkConfig::Read();
+ Host::Read();
+
+ Host::SetWriteHostname(
NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"]:true );
+ y2milestone("write_hostname_to_hosts value from sysconfig : %1",
NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"]:true);
/* install.inf from linuxrc */
map install_inf = $[];
@@ -208,18 +212,16 @@
//are defined for each static IP separately in address dialog
//FaTE #2202
- if (NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"]:true == false)
- Host::write_hostname=false;
- else
- {
+ if (Host::WriteHostname()) {
//Always add 127.0.0.2 entry to /etc/hosts, otherwise some
//desktop apps may hang, not being able to resolve hostname (#304632)
//empty list [] as third parameter does that
- Host::Update(oldhostname, fqhostname, []);
+ Host::Update(oldhostname, fqhostname, []);
Host::Write();
}
oldhostname = fqhostname; // #49634
+ NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"] = Host::WriteHostname();
NetworkConfig::Write();
y2milestone("Writing configuration");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.18.2/src/modules/Host.ycp
new/yast2-network-2.18.3/src/modules/Host.ycp
--- old/yast2-network-2.18.2/src/modules/Host.ycp 2008-06-02
16:20:00.000000000 +0200
+++ new/yast2-network-2.18.3/src/modules/Host.ycp 2009-02-10
11:00:37.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Hosts data (/etc/hosts)
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: Host.ycp 47991 2008-06-02 14:19:59Z mzugec $
+ * $Id: Host.ycp 55189 2009-02-02 13:58:15Z kmachalkova $
*/
{
@@ -13,6 +13,7 @@
textdomain "network";
import "Hostname";
+import "NetworkConfig";
import "String";
import "Summary";
@@ -31,7 +32,10 @@
*/
global boolean modified = false;
-global boolean write_hostname = true;
+/**
+ * Should static hostname be written to /etc/hosts?
+ */
+boolean write_hostname = true;
/**
* All hosts read at the start
@@ -50,6 +54,16 @@
boolean initialized = false;
+global boolean WriteHostname()
+{
+ return write_hostname;
+}
+
+global void SetWriteHostname( boolean w)
+{
+ write_hostname = w;
+}
+
/**
* Read hosts settings
* @return true if success
@@ -83,6 +97,7 @@
global define boolean Write() {
y2milestone("Writing configuration");
+
if(!modified) {
y2milestone("No changes to Host -> nothing to write");
return true;
@@ -94,7 +109,6 @@
return true;
}
-
list <string> steps = [
_("Update /etc/hosts"),
];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.18.2/src/modules/LanItems.ycp
new/yast2-network-2.18.3/src/modules/LanItems.ycp
--- old/yast2-network-2.18.2/src/modules/LanItems.ycp 2009-01-26
09:27:17.000000000 +0100
+++ new/yast2-network-2.18.3/src/modules/LanItems.ycp 2009-02-11
15:15:04.000000000 +0100
@@ -1595,11 +1595,16 @@
case "qeth":
case "hsi":
string portnumber_param = (size(qeth_portnumber)>0) ? sformat("-n %1",
qeth_portnumber) : "";
+/*
if (size(chan_mode)>0)
// chan_ids (read, write, control), port
command1=sformat("qeth_configure %1 -p %2 %3 %4 1",
qeth_layer2?"-l":"", chan_mode, portnumber_param, qeth_chanids);
else
command1=sformat("qeth_configure %1 %2 %3 1",
qeth_layer2?"-l":"", portnumber_param, qeth_chanids);
+*/
+ string portname_param=(size(chan_mode)>0) ? sformat("-p %1", chan_mode)
: "";
+ string options_param=(size(qeth_options)>0) ? sformat("-o %1",
qeth_options) : "";
+ command1=sformat("qeth_configure %1 %2 %3 %4 %5 1", options_param,
qeth_layer2?"-l":"", portname_param, portnumber_param, qeth_chanids);
command2=sformat("ls /sys/devices/qeth/%1/net/|head -n1|tr -d '\n'",
(splitstring(qeth_chanids, " "))[0]:"");
break;
case "ctc":
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.18.2/src/modules/Proxy.ycp
new/yast2-network-2.18.3/src/modules/Proxy.ycp
--- old/yast2-network-2.18.2/src/modules/Proxy.ycp 2008-01-24
14:41:27.000000000 +0100
+++ new/yast2-network-2.18.3/src/modules/Proxy.ycp 2009-02-10
11:00:37.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Proxy data
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: Proxy.ycp 42298 2007-11-21 16:45:32Z kmachalkova $
+ * $Id: Proxy.ycp 55145 2009-01-29 11:09:27Z kmachalkova $
*
* Configures FTP and HTTP proxies via sysconfig & SuSEconfig
* and /root/.curlrc (for YOU)
@@ -40,17 +40,13 @@
/**
* Display popup at the end of the proxy configuration
* @param modified true if proxy settings have been modified
+ */
define void ProxyFinishPopup(boolean modified) ``{
-string text = _("Applications that support it, such as YaST2 Online Update,
-use them immediately. Other applications use them after a new login
-(lynx, wget). Some applications do not support these settings at all --
-they use their own settings system.
-");
+string text = _("It is recommended to relogin to make new proxy settings
effective.");
FinishPopup(modified, "proxy", text, "", []);
}
- */
/**
* Read settings
@@ -172,8 +168,8 @@
sleep(sl);
Progress::NextStage();
- /*if (!Mode::config ())
- ProxyFinishPopup(true); */
+ if (!Mode::config ())
+ ProxyFinishPopup(true);
/* Update /root/.wgetrc */
/* YOU uses curl(1)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.18.2/src/remote/dialogs.ycp
new/yast2-network-2.18.3/src/remote/dialogs.ycp
--- old/yast2-network-2.18.2/src/remote/dialogs.ycp 2008-10-27
13:49:29.000000000 +0100
+++ new/yast2-network-2.18.3/src/remote/dialogs.ycp 2009-01-26
12:43:31.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Dialog for Remote Administration
* Authors: Arvin Schnell <arvin@xxxxxxx>
*
- * $Id: dialogs.ycp 52563 2008-10-27 11:27:40Z kmachalkova $
+ * $Id: dialogs.ycp 54992 2009-01-26 11:43:30Z mzugec $
*/
{
@@ -78,6 +78,9 @@
Wizard::SetContentsButtons(caption, contents, help,
Label::BackButton(), Label::FinishButton());
+ Wizard::SetNextButton(`next, Label::OKButton());
+ Wizard::SetAbortButton(`abort, Label::CancelButton());
+ Wizard::HideBackButton();
UI::ChangeWidget(`id(`allow), `Value, Remote::allow_administration);
UI::ChangeWidget(`id(`disallow), `Value, !Remote::allow_administration);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.18.2/src/services/dns.ycp
new/yast2-network-2.18.3/src/services/dns.ycp
--- old/yast2-network-2.18.2/src/services/dns.ycp 2008-12-03
10:59:07.000000000 +0100
+++ new/yast2-network-2.18.3/src/services/dns.ycp 2009-02-10
11:00:36.000000000 +0100
@@ -5,7 +5,7 @@
* Authors: Michal Svec <msvec@xxxxxxx>
* Martin Vidner <mvidner@xxxxxxx>
*
- * $Id: dns.ycp 53812 2008-12-02 13:43:34Z kmachalkova $
+ * $Id: dns.ycp 55189 2009-02-02 13:58:15Z kmachalkova $
*/
{
@@ -15,6 +15,7 @@
import "CWM";
import "DNS";
import "GetInstArgs";
+import "Host";
import "Hostname";
import "IP";
import "Label";
@@ -70,7 +71,7 @@
"DOMAIN": DNS::domain,
"DHCP_HOSTNAME": NetworkConfig::DHCP["DHCLIENT_SET_HOSTNAME"]:false,
// set as true by default because there wasn't this option in previous
version
- "WRITE_HOSTNAME": NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"]:true
+ "WRITE_HOSTNAME": Host::WriteHostname()
];
// the rest is not so straightforward,
// because we have list variables but non-list widgets
@@ -108,7 +109,7 @@
DNS::nameservers = NonEmpty (nameservers);
DNS::searchlist = NonEmpty (searchlist);
NetworkConfig::DHCP["DHCLIENT_SET_HOSTNAME"] =
settings["DHCP_HOSTNAME"]:false;
- NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"] =
settings["WRITE_HOSTNAME"]:true;
+ Host::SetWriteHostname( settings["WRITE_HOSTNAME"]:true );
/* update modified flag */
DNS::modified = true;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.18.2/src/services/host.ycp
new/yast2-network-2.18.3/src/services/host.ycp
--- old/yast2-network-2.18.2/src/services/host.ycp 2009-01-14
15:14:23.000000000 +0100
+++ new/yast2-network-2.18.3/src/services/host.ycp 2009-01-26
13:23:35.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Hosts configuration dialogs
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: host.ycp 54565 2009-01-12 18:47:08Z mzugec $
+ * $Id: host.ycp 54997 2009-01-26 12:23:34Z mzugec $
*
* Hosts configuration dialogs
*/
@@ -86,7 +86,7 @@
string name = regexpsub(s, "^([^ \t]+)[ \t].*$", "\\1");
string aliases = regexpsub(s, "^[^ \t]+[ \t]+(.*)[ \t]*$", "\\1");
- term item = `item(`id(size(table_items)), host,
+ term item = `item(`id(size(table_items)), host,
Punycode::DecodeDomainName(name),
Punycode::DecodePunycodes( [aliases] )[0]:"");
table_items = add(table_items, item);
});
@@ -125,13 +125,12 @@
),
`HSpacing(5)
);
-
if(standalone == true) {
-// Wizard::SetContentsButtons(caption, contents, help,
-// Label::CancelButton(), Label::OKButton());
- //In standalone mode, there's no going back
-// Wizard::DisableBackButton();
- Wizard::OpenOKDialog();
+ Wizard::SetContentsButtons(caption, contents, help,
+ Label::CancelButton(), Label::OKButton());
+ Wizard::SetNextButton(`next, Label::OKButton());
+ Wizard::SetAbortButton(`abort, Label::CancelButton());
+ Wizard::HideBackButton();
}
else
Wizard::SetContentsButtons(caption, contents, help,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.18.2/src/services/proxy.ycp
new/yast2-network-2.18.3/src/services/proxy.ycp
--- old/yast2-network-2.18.2/src/services/proxy.ycp 2008-04-21
12:32:10.000000000 +0200
+++ new/yast2-network-2.18.3/src/services/proxy.ycp 2009-02-10
11:00:36.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Proxy configuration
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: proxy.ycp 46855 2008-04-18 13:48:54Z jsrain $
+ * $Id: proxy.ycp 55145 2009-01-29 11:09:27Z kmachalkova $
*/
{
@@ -287,7 +287,9 @@
/* Proxy dialog help 1/8 */
string help = _("<p>Configure your Internet proxy (caching) settings
here.</p>
-<p><b>Note:</b> In some cases you may need to relogin for the settings to take
effect</p>") +
+<p><b>Note:</b> It is generally recommended to relogin for the settings to
take effect,
+however in some cases the application may pick up new settings immediately.
Please check
+what your application (web browser, ftp client,...) supports. </p>") +
/* Proxy dialog help 2/8 */
_("<p><b>HTTP Proxy URL</b> is the name of the proxy server for your access
@@ -380,12 +382,17 @@
`HSpacing(5)
);
- if(standalone == true)
+// if(standalone == true)
Wizard::SetContentsButtons(caption, contents, help,
Label::BackButton(), Label::FinishButton());
+ Wizard::SetNextButton(`next, Label::OKButton());
+ Wizard::SetAbortButton(`abort, Label::CancelButton());
+ Wizard::HideBackButton();
+/*
else
Wizard::SetContentsButtons(caption, contents, help,
Label::BackButton(), Label::OKButton());
+*/
//We have the same (non-empty) proxy URL for all protocols
if((http != prefill) && (http == https) && (https == ftp )){
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.18.2/VERSION
new/yast2-network-2.18.3/VERSION
--- old/yast2-network-2.18.2/VERSION 2009-01-22 14:39:18.000000000 +0100
+++ new/yast2-network-2.18.3/VERSION 2009-02-11 15:19:24.000000000 +0100
@@ -1 +1 @@
-2.18.2
+2.18.3
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |