Author: kmachalkova Date: Tue Jan 26 11:13:37 2010 New Revision: 60530 URL: http://svn.opensuse.org/viewcvs/yast?rev=60530&view=rev Log: Set modified flag for DNS settings correctly Modified: branches/SuSE-Code-11-SP1-Branch/network/src/modules/DNS.ycp branches/SuSE-Code-11-SP1-Branch/network/src/services/dns.ycp Modified: branches/SuSE-Code-11-SP1-Branch/network/src/modules/DNS.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/src/modules/DNS.ycp?rev=60530&r1=60529&r2=60530&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/modules/DNS.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/modules/DNS.ycp Tue Jan 26 11:13:37 2010 @@ -70,7 +70,7 @@ if (ns == "" || ns == nil) return false; nameservers = [ ns ]; - modified = true; + //modified = true; return true; } @@ -85,7 +85,7 @@ return false; hostname = hn; domain = dn; - modified = true; + //modified = true; return true; } Modified: branches/SuSE-Code-11-SP1-Branch/network/src/services/dns.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/src/services/dns.ycp?rev=60530&r1=60529&r2=60530&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/services/dns.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/services/dns.ycp Tue Jan 26 11:13:37 2010 @@ -47,6 +47,11 @@ boolean resolver_modifiable = false; /** + * original setup, used to determine whether data have been modified + */ +map settings_orig = $[]; + +/** * CWM buffer for both dialogs. Note that NAMESERVERS and SEARCHLIST * are lists and their widgets are suffixed. */ @@ -87,6 +92,8 @@ settings["NAMESERVER_2"] = DNS::nameservers[1]:""; settings["NAMESERVER_3"] = DNS::nameservers[2]:""; + settings_orig = settings; + return settings; } @@ -110,8 +117,8 @@ DNS::write_hostname = settings["WRITE_HOSTNAME"]:true; /* update modified flag */ - DNS::modified = true; - y2milestone("modified DNS"); + DNS::modified = DNS::modified || (settings != settings_orig); + y2milestone("Modified DNS: %1", DNS::modified ); } /** @@ -329,6 +336,7 @@ has_dhcp = Lan::AnyDHCPDevice (); hn_settings = InitSettings (); + foreach(string key, (list<string>)Map::Keys(hn_settings),{ InitHnWidget(key); }); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org