[yast-commit] r67911 - in /trunk: network/ network/package/ network/src/lan/ network/src/services/ proxy/ proxy/config/ proxy/package/ proxy/src/ proxy/src/clients/ proxy/src/include/ proxy/src/include/proxy/ pr...

Author: mvidner Date: Wed Apr 11 11:21:56 2012 New Revision: 67911 URL: http://svn.opensuse.org/viewcvs/yast?rev=67911&view=rev Log: Fixes for the network-proxt split: Moved a forgotten file from network to proxy. Fixed a dead reference from network to proxy. Added svn:ignore (argh) Added: trunk/proxy/src/include/ (with props) trunk/proxy/src/include/Makefile.am trunk/proxy/src/include/proxy/ (with props) trunk/proxy/src/include/proxy/Makefile.am trunk/proxy/src/include/proxy/dialogs.ycp - copied, changed from r67871, trunk/network/src/services/proxy.ycp Removed: trunk/network/src/services/proxy.ycp Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/lan/wizards.ycp trunk/proxy/ (props changed) trunk/proxy/VERSION trunk/proxy/config/ (props changed) trunk/proxy/package/ (props changed) trunk/proxy/package/yast2-proxy.changes trunk/proxy/src/ (props changed) trunk/proxy/src/Makefile.am trunk/proxy/src/clients/ (props changed) trunk/proxy/src/clients/proxy.ycp trunk/proxy/src/clients/proxy_auto.ycp trunk/proxy/src/clients/proxy_proposal.ycp trunk/proxy/src/modules/ (props changed) trunk/proxy/testsuite/ (props changed) Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=67911&r1=67910&r2=67911&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Wed Apr 11 11:21:56 2012 @@ -1 +1 @@ -2.22.6 +2.22.7 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=67911&r1=67910&r2=67911&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Wed Apr 11 11:21:56 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 11 11:13:51 CEST 2012 - mvidner@suse.cz + +- Fixed a dead reference to proxy code; moved a forgotten file. +- 2.22.7 + +------------------------------------------------------------------- Tue Apr 10 14:45:17 CEST 2012 - mvidner@suse.cz - Moved proxy client config to a new package yast2-proxy.rpm Modified: trunk/network/src/lan/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/wizards.ycp?rev=67911&r1=67910&r2=67911&view=diff ============================================================================== --- trunk/network/src/lan/wizards.ycp (original) +++ trunk/network/src/lan/wizards.ycp Wed Apr 11 11:21:56 2012 @@ -25,7 +25,6 @@ include "network/lan/wireless.ycp"; include "network/services/dns.ycp"; include "network/services/host.ycp"; -include "network/services/proxy.ycp"; define symbol NetworkCardSequence(string action); define symbol MainSequence(string mode); @@ -189,7 +188,6 @@ // "changedefaults": [ ``(ChangeDefaults()), true ], "address" : ``(AddressDialog()), "hosts" : ``(HostsMainDialog(false)), - "proxy" : ``(ProxyMainDialog(false)), "s390" : ``(S390Dialog()), "wire" : ``(WirelessDialog()), "expert" : ``(WirelessExpertDialog()), @@ -212,7 +210,6 @@ `next : "commit", `wire : "wire", `hosts : "hosts", - `proxy : "proxy", `s390 : "s390", `hardware : `hardware, ], @@ -224,10 +221,6 @@ `abort : `abort, `next : "address", ], - "proxy" : $[ - `abort : `abort, - `next : "address", - ], "wire" : $[ `next : "commit", `expert : "expert", Modified: trunk/proxy/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/VERSION?rev=67911&r1=67910&r2=67911&view=diff ============================================================================== --- trunk/proxy/VERSION (original) +++ trunk/proxy/VERSION Wed Apr 11 11:21:56 2012 @@ -1 +1 @@ -2.22.0 +2.22.1 Modified: trunk/proxy/package/yast2-proxy.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/package/yast2-proxy.changes?rev=67911&r1=67910&r2=67911&view=diff ============================================================================== --- trunk/proxy/package/yast2-proxy.changes (original) +++ trunk/proxy/package/yast2-proxy.changes Wed Apr 11 11:21:56 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 11 11:15:23 CEST 2012 - mvidner@suse.cz + +- Moved over one forgotten file. +- 2.22.1 + +------------------------------------------------------------------- Tue Apr 10 14:49:56 CEST 2012 - mvidner@suse.cz - Split off yast2-network Modified: trunk/proxy/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/src/Makefile.am?rev=67911&r1=67910&r2=67911&view=diff ============================================================================== --- trunk/proxy/src/Makefile.am (original) +++ trunk/proxy/src/Makefile.am Wed Apr 11 11:21:56 2012 @@ -1 +1 @@ -SUBDIRS = clients modules +SUBDIRS = clients include modules Modified: trunk/proxy/src/clients/proxy.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/src/clients/proxy.ycp?rev=67911&r1=67910&r2=67911&view=diff ============================================================================== --- trunk/proxy/src/clients/proxy.ycp (original) +++ trunk/proxy/src/clients/proxy.ycp Wed Apr 11 11:21:56 2012 @@ -32,8 +32,7 @@ } any ProxyGUI() { - include "network/runtime.ycp"; - include "network/services/proxy.ycp"; + include "proxy/dialogs.ycp"; Proxy::Read (); Modified: trunk/proxy/src/clients/proxy_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/src/clients/proxy_auto.ycp?rev=67911&r1=67910&r2=67911&view=diff ============================================================================== --- trunk/proxy/src/clients/proxy_auto.ycp (original) +++ trunk/proxy/src/clients/proxy_auto.ycp Wed Apr 11 11:21:56 2012 @@ -30,7 +30,7 @@ import "Wizard"; import "Summary"; -include "network/services/proxy.ycp"; +include "proxy/dialogs.ycp"; /** * Return a modification status Modified: trunk/proxy/src/clients/proxy_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/src/clients/proxy_proposal.ycp?rev=67911&r1=67910&r2=67911&view=diff ============================================================================== --- trunk/proxy/src/clients/proxy_proposal.ycp (original) +++ trunk/proxy/src/clients/proxy_proposal.ycp Wed Apr 11 11:21:56 2012 @@ -53,7 +53,7 @@ /* run the module */ else if(func == "AskUser") { - include "network/services/proxy.ycp"; + include "proxy/dialogs.ycp"; map stored = Proxy::Export(); Added: trunk/proxy/src/include/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/src/include/Makefile.am?rev=67911&view=auto ============================================================================== --- trunk/proxy/src/include/Makefile.am (added) +++ trunk/proxy/src/include/Makefile.am Wed Apr 11 11:21:56 2012 @@ -0,0 +1 @@ +SUBDIRS = proxy Added: trunk/proxy/src/include/proxy/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/src/include/proxy/Makefile.am?rev=67911&view=auto ============================================================================== --- trunk/proxy/src/include/proxy/Makefile.am (added) +++ trunk/proxy/src/include/proxy/Makefile.am Wed Apr 11 11:21:56 2012 @@ -0,0 +1,4 @@ +yncludedir = @yncludedir@/proxy +ynclude_DATA = dialogs.ycp + +EXTRA_DIST = $(ynclude_DATA) Copied: trunk/proxy/src/include/proxy/dialogs.ycp (from r67871, trunk/network/src/services/proxy.ycp) URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/src/include/proxy/dialogs.ycp?p2=trunk/proxy/src/include/proxy/dialogs.ycp&p1=trunk/network/src/services/proxy.ycp&r1=67871&r2=67911&rev=67911&view=diff ============================================================================== --- trunk/network/src/services/proxy.ycp (original) +++ trunk/proxy/src/include/proxy/dialogs.ycp Wed Apr 11 11:21:56 2012 @@ -1,7 +1,6 @@ /** - * File: include/network/services/proxy.ycp - * Package: Network configuration - * Summary: Proxy configuration + * File: include/proxy/dialogs.ycp + * Package: Proxy configuration * Authors: Michal Svec * * $Id$ @@ -9,7 +8,7 @@ { -textdomain "network"; +textdomain "proxy"; import "Address"; import "Hostname"; @@ -22,8 +21,6 @@ import "URL"; import "Wizard"; -include "network/routines.ycp"; - boolean enabled = false; string http = ""; string https = ""; @@ -343,6 +340,15 @@ return size( ret[ "pass"]:"") > 0 ; } + +/** + * If modified, ask for confirmation + * @return true if abort is confirmed + */ +boolean ReallyAbortCond() { + return !modified() || Popup::ReallyAbort(true); +} + /** * Proxy dialog * @param standalone true if not run from another ycp client @@ -358,8 +364,6 @@ user = Proxy::user; pass = Proxy::pass; - ScreenName("proxy"); - if(http == "") http = prefill; if(https == "") https = prefill; if(ftp == "") ftp = prefill; @@ -504,7 +508,7 @@ /* abort? */ if(ret == `abort || ret == `cancel || ret == `back) { - if(ReallyAbortCond( modified() )) break; + if(ReallyAbortCond()) break; else continue; } if(ret == `enabled) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org