From 57210c7d4bab67be821ffb3e0c164704db948f4a Mon Sep 17 00:00:00 2001 From: Michal Filka Date: Fri, 9 Nov 2012 12:50:21 +0100 Subject: [PATCH] Code cleanup. Removed obsolete function. Removed CVS/SVN specific tags Function ScreenName has been obsolete (and empty) for some time. $Id$ reference is not needed any more as it is CVS/SVN specific. --- data/modem-t35-keys.ycp | 1 - data/phone-codes.ycp | 1 - src/clients/dns.ycp | 1 - src/clients/dns_auto.ycp | 1 - src/clients/dsl.ycp | 1 - src/clients/dsl_proposal.ycp | 1 - src/clients/general_proposal.ycp | 1 - src/clients/host.ycp | 1 - src/clients/host_auto.ycp | 1 - src/clients/inst_lan.ycp | 1 - src/clients/isdn.ycp | 1 - src/clients/isdn_proposal.ycp | 1 - src/clients/lan.ycp | 1 - src/clients/lan_auto.ycp | 1 - src/clients/lan_proposal.ycp | 1 - src/clients/modem.ycp | 1 - src/clients/modem_proposal.ycp | 1 - src/clients/network.ycp | 1 - src/clients/provider.ycp | 1 - src/clients/remote.ycp | 1 - src/clients/remote_proposal.ycp | 1 - src/clients/routing.ycp | 1 - src/clients/routing_auto.ycp | 1 - src/clients/save_network.ycp | 1 - src/dsl/complex.ycp | 7 ------- src/dsl/dialogs.ycp | 3 --- src/dsl/wizards.ycp | 1 - src/installation/dialogs.ycp | 8 -------- src/installation/inst_ask_net_test.ycp | 1 - src/installation/inst_do_net_test.ycp | 1 - src/installation/inst_hostname.ycp | 1 - src/installation/inst_netprobe.ycp | 1 - src/installation/manual-tests/hostname.ycp | 1 - src/installation/manual-tests/test-net-test.ycp | 1 - src/isdn/complex.ycp | 1 - src/isdn/config.ycp | 1 - src/isdn/ifdetails.ycp | 1 - src/isdn/interface.ycp | 1 - src/isdn/ip.ycp | 1 - src/isdn/lowlevel.ycp | 2 -- src/isdn/routines.ycp | 1 - src/isdn/wizards.ycp | 1 - src/lan/address.ycp | 2 -- src/lan/cards.ycp | 1 - src/lan/cmdline.ycp | 1 - src/lan/complex.ycp | 4 ---- src/lan/dhcp.ycp | 1 - src/lan/hardware.ycp | 4 ---- src/lan/virtual.ycp | 3 --- src/lan/wireless.ycp | 8 -------- src/lan/wizards.ycp | 1 - src/modem/complex.ycp | 7 ------- src/modem/dialogs.ycp | 5 ----- src/modem/wizards.ycp | 1 - src/modules/DNS.ycp | 1 - src/modules/DSL.ycp | 1 - src/modules/Host.ycp | 1 - src/modules/ISDN.ycp | 1 - src/modules/InternetDevices.ycp | 1 - src/modules/Lan.ycp | 1 - src/modules/LanUdevAuto.ycp | 1 - src/modules/Modem.ycp | 1 - src/modules/NetHwDetection.ycp | 1 - src/modules/Network.ycp | 1 - src/modules/NetworkStorage.ycp | 1 - src/modules/Provider.ycp | 1 - src/modules/Remote.ycp | 1 - src/modules/Routing.ycp | 1 - src/modules/SuSEFirewall4Network.ycp | 1 - src/provider/complex.ycp | 7 ------- src/provider/connection.ycp | 5 ++--- src/provider/details.ycp | 3 --- src/provider/dialogs.ycp | 2 -- src/provider/helps.ycp | 1 - src/provider/provider.ycp | 3 --- src/provider/texts.ycp | 1 - src/provider/wizards.ycp | 1 - src/remote/dialogs.ycp | 5 ----- src/routines/complex.ycp | 1 - src/routines/devices.ycp | 1 - src/routines/hardware.ycp | 1 - src/routines/routines.ycp | 9 --------- src/routines/runtime.ycp | 1 - src/routines/summary.ycp | 1 - src/routines/widgets.ycp | 1 - src/services/dns.ycp | 1 - src/services/host.ycp | 5 ----- src/services/routing.ycp | 1 - 88 files changed, 2 insertions(+), 159 deletions(-) diff --git a/data/modem-t35-keys.ycp b/data/modem-t35-keys.ycp index be34e4dd6..107238b03 100644 --- a/data/modem-t35-keys.ycp +++ b/data/modem-t35-keys.ycp @@ -1,5 +1,4 @@ /** - * $Id$ * Author: Michal Svec */ diff --git a/data/phone-codes.ycp b/data/phone-codes.ycp index 335677019..2a96e4c48 100644 --- a/data/phone-codes.ycp +++ b/data/phone-codes.ycp @@ -1,7 +1,6 @@ /** * International phone codes map * Author: Michal Svec - * $Id$ */ { diff --git a/src/clients/dns.ycp b/src/clients/dns.ycp index 9eb9a4524..3613eb818 100644 --- a/src/clients/dns.ycp +++ b/src/clients/dns.ycp @@ -4,7 +4,6 @@ * Summary: Hostname and DNS client * Authors: Michal Svec * - * $Id$ * * Main file for hostname and DNS configuration. * Uses all other files. diff --git a/src/clients/dns_auto.ycp b/src/clients/dns_auto.ycp index 58bde6ac8..2e416e2e8 100644 --- a/src/clients/dns_auto.ycp +++ b/src/clients/dns_auto.ycp @@ -4,7 +4,6 @@ * Summary: Client for autoinstallation * Authors: Michal Svec * - * $Id$ * * This is a client for autoinstallation. It takes its arguments, * goes through the configuration and return the setting. diff --git a/src/clients/dsl.ycp b/src/clients/dsl.ycp index d208d188b..180ec1651 100644 --- a/src/clients/dsl.ycp +++ b/src/clients/dsl.ycp @@ -4,7 +4,6 @@ * Summary: DSL main file * Authors: Michal Svec * - * $Id$ * * Main file for DSL configuration. * Uses all other files. diff --git a/src/clients/dsl_proposal.ycp b/src/clients/dsl_proposal.ycp index 075e7e303..f8a204e12 100644 --- a/src/clients/dsl_proposal.ycp +++ b/src/clients/dsl_proposal.ycp @@ -4,7 +4,6 @@ * Summary: DSL configuration proposal * Authors: Michal Svec * - * $Id$ */ { diff --git a/src/clients/general_proposal.ycp b/src/clients/general_proposal.ycp index 8a93cc674..0f5ee6959 100644 --- a/src/clients/general_proposal.ycp +++ b/src/clients/general_proposal.ycp @@ -4,7 +4,6 @@ * Summary: Network mode + ipv6 proposal * Authors: Martin Vidner * - * $Id$ * * This is not a standalone proposal, it depends on lan_proposal. It * must run after it. diff --git a/src/clients/host.ycp b/src/clients/host.ycp index a9b3d4b97..9f752cf83 100644 --- a/src/clients/host.ycp +++ b/src/clients/host.ycp @@ -4,7 +4,6 @@ * Summary: Hosts client * Authors: Michal Svec * - * $Id$ * * Main file for hosts configuration. * Uses all other files. diff --git a/src/clients/host_auto.ycp b/src/clients/host_auto.ycp index b612a27ce..21701b6e9 100644 --- a/src/clients/host_auto.ycp +++ b/src/clients/host_auto.ycp @@ -4,7 +4,6 @@ * Summary: Client for autoinstallation * Authors: Michal Svec * - * $Id$ * * This is a client for autoinstallation. It takes its arguments, * goes through the configuration and return the setting. diff --git a/src/clients/inst_lan.ycp b/src/clients/inst_lan.ycp index b2d47ff53..bef4069a7 100644 --- a/src/clients/inst_lan.ycp +++ b/src/clients/inst_lan.ycp @@ -4,7 +4,6 @@ * Summary: Network cards main file * Authors: Michal Svec * - * $Id: lan.ycp 53338 2008-11-14 16:45:48Z mzugec $ * * Main file for network card configuration. * Uses all other files. diff --git a/src/clients/isdn.ycp b/src/clients/isdn.ycp index 4277d91bb..16331e296 100644 --- a/src/clients/isdn.ycp +++ b/src/clients/isdn.ycp @@ -4,7 +4,6 @@ * Summary: ISDN main file * Authors: Michal Svec * - * $Id$ * * Main file for ISDN configuration. * Uses all other files. diff --git a/src/clients/isdn_proposal.ycp b/src/clients/isdn_proposal.ycp index 6bf65336d..884cade4e 100644 --- a/src/clients/isdn_proposal.ycp +++ b/src/clients/isdn_proposal.ycp @@ -4,7 +4,6 @@ * Summary: ISDN configuration proposal * Authors: Michal Svec * - * $Id$ */ { diff --git a/src/clients/lan.ycp b/src/clients/lan.ycp index 9062d3d74..834ca0952 100644 --- a/src/clients/lan.ycp +++ b/src/clients/lan.ycp @@ -4,7 +4,6 @@ * Summary: Network cards main file * Authors: Michal Svec * - * $Id$ * * Main file for network card configuration. * Uses all other files. diff --git a/src/clients/lan_auto.ycp b/src/clients/lan_auto.ycp index 338956c93..42a95e594 100644 --- a/src/clients/lan_auto.ycp +++ b/src/clients/lan_auto.ycp @@ -4,7 +4,6 @@ * Summary: Lan configuration proposal * Authors: Michal Svec * - * $Id$ */ { diff --git a/src/clients/lan_proposal.ycp b/src/clients/lan_proposal.ycp index aa9b56a8c..5c3841e20 100644 --- a/src/clients/lan_proposal.ycp +++ b/src/clients/lan_proposal.ycp @@ -4,7 +4,6 @@ * Summary: Lan configuration proposal * Authors: Michal Svec * - * $Id$ */ { diff --git a/src/clients/modem.ycp b/src/clients/modem.ycp index 64abc804d..cda0ab56e 100644 --- a/src/clients/modem.ycp +++ b/src/clients/modem.ycp @@ -4,7 +4,6 @@ * Summary: Modems main file * Authors: Michal Svec * - * $Id$ * * Main file for modem configuration. * Uses all other files. diff --git a/src/clients/modem_proposal.ycp b/src/clients/modem_proposal.ycp index b2108ef87..a52672231 100644 --- a/src/clients/modem_proposal.ycp +++ b/src/clients/modem_proposal.ycp @@ -4,7 +4,6 @@ * Summary: Modem configuration proposal * Authors: Michal Svec * - * $Id$ */ { diff --git a/src/clients/network.ycp b/src/clients/network.ycp index 123446875..af9c71683 100644 --- a/src/clients/network.ycp +++ b/src/clients/network.ycp @@ -4,7 +4,6 @@ * Summary: Main network client * Authors: Michal Svec * - * $Id$ * * Main file for the network configuration. * Uses all other files. diff --git a/src/clients/provider.ycp b/src/clients/provider.ycp index 6fa1f034c..e1fc8d51f 100644 --- a/src/clients/provider.ycp +++ b/src/clients/provider.ycp @@ -4,7 +4,6 @@ * Summary: Provider main file * Authors: Michal Svec * - * $Id$ * * Main file for provider configuration. * Uses all other files. diff --git a/src/clients/remote.ycp b/src/clients/remote.ycp index aceca7878..435b6332f 100644 --- a/src/clients/remote.ycp +++ b/src/clients/remote.ycp @@ -5,7 +5,6 @@ * Authors: Arvin Schnell * Michal Svec * - * $Id$ */ { diff --git a/src/clients/remote_proposal.ycp b/src/clients/remote_proposal.ycp index f73b8ccb8..04e1d0f30 100644 --- a/src/clients/remote_proposal.ycp +++ b/src/clients/remote_proposal.ycp @@ -5,7 +5,6 @@ * Authors: Arvin Schnell * Michal Svec * - * $Id$ */ { diff --git a/src/clients/routing.ycp b/src/clients/routing.ycp index 4e6263c5c..16abbeef6 100644 --- a/src/clients/routing.ycp +++ b/src/clients/routing.ycp @@ -4,7 +4,6 @@ * Summary: Routing client * Authors: Michal Svec * - * $Id$ * * Main file for routing configuration. * Uses all other files. diff --git a/src/clients/routing_auto.ycp b/src/clients/routing_auto.ycp index b44ae2693..b98d3b2c7 100644 --- a/src/clients/routing_auto.ycp +++ b/src/clients/routing_auto.ycp @@ -4,7 +4,6 @@ * Summary: Client for autoinstallation * Authors: Michal Svec * - * $Id$ * * This is a client for autoinstallation. It takes its arguments, * goes through the configuration and return the setting. diff --git a/src/clients/save_network.ycp b/src/clients/save_network.ycp index fb821717f..8c24d836a 100644 --- a/src/clients/save_network.ycp +++ b/src/clients/save_network.ycp @@ -4,7 +4,6 @@ * Summary: Installation routines * Authors: Michal Zugec * - * $Id: save_network.ycp 38154 2007-05-28 08:20:39Z mzugec $ * */ diff --git a/src/dsl/complex.ycp b/src/dsl/complex.ycp index fcc94d442..f1de73000 100644 --- a/src/dsl/complex.ycp +++ b/src/dsl/complex.ycp @@ -4,7 +4,6 @@ * Summary: Summary, overview and IO dialogs for DSL configuration. * Authors: Michal Svec * - * $Id$ */ { @@ -62,8 +61,6 @@ define symbol FinishDialog() { */ define symbol ReadDialog() { - ScreenName("dsl-read"); - /* DSL read dialog help 1/2 */ string helptext = _("

Initializing DSL Configuration
Please wait...

"); @@ -86,8 +83,6 @@ define symbol ReadDialog() { */ define symbol WriteDialog() { - ScreenName("dsl-write"); - if(!Modified()) return `next; /* DSL write dialog help 1/2 */ @@ -275,8 +270,6 @@ symbol HandleProviders (string widget_id, map event) */ define any OverviewDialog() { - ScreenName("dsl-overview"); - /* DSL overview dialog caption */ string caption = _("DSL Configuration Overview"); diff --git a/src/dsl/dialogs.ycp b/src/dsl/dialogs.ycp index a6363be2d..5cdd9d1c4 100644 --- a/src/dsl/dialogs.ycp +++ b/src/dsl/dialogs.ycp @@ -4,7 +4,6 @@ * Summary: Configuration dialogs for DSL * Authors: Michal Svec * - * $Id$ */ { @@ -35,8 +34,6 @@ include "network/installation/dialogs.ycp"; */ define any DSLDialog() { - ScreenName("dsl-dialog"); - widget_descr["STARTMODE"] = MakeStartmode ( ["auto", "hotplug", "manual", "off", ]); diff --git a/src/dsl/wizards.ycp b/src/dsl/wizards.ycp index bd0a29b30..20ea4c392 100644 --- a/src/dsl/wizards.ycp +++ b/src/dsl/wizards.ycp @@ -4,7 +4,6 @@ * Summary: DSL configuration wizards * Authors: Michal Svec * - * $Id$ */ { diff --git a/src/installation/dialogs.ycp b/src/installation/dialogs.ycp index d88947b37..1a516f033 100644 --- a/src/installation/dialogs.ycp +++ b/src/installation/dialogs.ycp @@ -5,7 +5,6 @@ * Authors: Michal Svec * Arvin Schnell * - * $Id$ */ { @@ -20,7 +19,6 @@ import "Popup"; import "Product"; import "String"; import "Wizard"; -include "network/routines.ycp"; include "network/widgets.ycp"; /** @@ -90,8 +88,6 @@ void SetDevice (string dev) { */ define symbol TestStepsDialog() { - ScreenName("installation-steps-dialog"); - /* Steps dialog caption */ string caption = _("Test Internet Connection"); @@ -237,8 +233,6 @@ string current = Internet::device; */ define void AskYOUDialog() { - ScreenName("installation-you-dialog"); - /* Radiobuttons */ term buttons = `VBox( `VSpacing(1), @@ -287,8 +281,6 @@ define void AskYOUDialog() { */ define void ShowLogs(list logs, string logdir) { - ScreenName("installation-show-logs"); - logs = sort(map x, map y, logs, { return x[`prio]:0 > y[`prio]:0; }); diff --git a/src/installation/inst_ask_net_test.ycp b/src/installation/inst_ask_net_test.ycp index 3b3ae84ff..807cbabb8 100644 --- a/src/installation/inst_ask_net_test.ycp +++ b/src/installation/inst_ask_net_test.ycp @@ -5,7 +5,6 @@ * Authors: Michal Svec * Arvin Schnell * - * $Id$ */ { diff --git a/src/installation/inst_do_net_test.ycp b/src/installation/inst_do_net_test.ycp index 15ed88261..907370372 100644 --- a/src/installation/inst_do_net_test.ycp +++ b/src/installation/inst_do_net_test.ycp @@ -5,7 +5,6 @@ * Authors: Michal Svec * Arvin Schnell * - * $Id$ */ { diff --git a/src/installation/inst_hostname.ycp b/src/installation/inst_hostname.ycp index 0d9645eeb..0914ce9fb 100644 --- a/src/installation/inst_hostname.ycp +++ b/src/installation/inst_hostname.ycp @@ -4,7 +4,6 @@ * Summary: Mandatory hostname configuration * Authors: Martin Vidner * - * $Id$ */ { diff --git a/src/installation/inst_netprobe.ycp b/src/installation/inst_netprobe.ycp index d989b0279..d113ec710 100644 --- a/src/installation/inst_netprobe.ycp +++ b/src/installation/inst_netprobe.ycp @@ -4,7 +4,6 @@ * Summary: Start the network detection * Authors: Michal Svec * - * $Id$ */ { diff --git a/src/installation/manual-tests/hostname.ycp b/src/installation/manual-tests/hostname.ycp index 48a737a1c..50f1c4cd6 100644 --- a/src/installation/manual-tests/hostname.ycp +++ b/src/installation/manual-tests/hostname.ycp @@ -1,5 +1,4 @@ // Author: Michal Zugec -// $Id$ // this file is for development only // running this file starts the internet test dialogs diff --git a/src/installation/manual-tests/test-net-test.ycp b/src/installation/manual-tests/test-net-test.ycp index d657fa144..11f7ee377 100644 --- a/src/installation/manual-tests/test-net-test.ycp +++ b/src/installation/manual-tests/test-net-test.ycp @@ -1,5 +1,4 @@ // Author: Michal Zugec -// $Id$ // this file is for development only // running this file starts the internet test dialogs diff --git a/src/isdn/complex.ycp b/src/isdn/complex.ycp index 4b052fae6..71f01a91b 100644 --- a/src/isdn/complex.ycp +++ b/src/isdn/complex.ycp @@ -4,7 +4,6 @@ * Summary: Summary and overview dialogs for ISDN configuration. * Authors: Michal Svec * - * $Id$ */ { diff --git a/src/isdn/config.ycp b/src/isdn/config.ycp index 9220f8c65..ffc594c83 100644 --- a/src/isdn/config.ycp +++ b/src/isdn/config.ycp @@ -11,7 +11,6 @@ * Authors: * Karsten keil * - * $Id$ * * All config settings are stored in a global variable Devices. * Deleted devices are in the global list DeletedDevices. diff --git a/src/isdn/ifdetails.ycp b/src/isdn/ifdetails.ycp index c8c68d8a1..caaa4882f 100644 --- a/src/isdn/ifdetails.ycp +++ b/src/isdn/ifdetails.ycp @@ -11,7 +11,6 @@ * Authors: * Karsten Keil * - * $Id$ * */ diff --git a/src/isdn/interface.ycp b/src/isdn/interface.ycp index e86b45870..9c67811dc 100644 --- a/src/isdn/interface.ycp +++ b/src/isdn/interface.ycp @@ -11,7 +11,6 @@ * Authors: * Karsten Keil * - * $Id$ * */ diff --git a/src/isdn/ip.ycp b/src/isdn/ip.ycp index 7fccc71a1..6ddc4c899 100644 --- a/src/isdn/ip.ycp +++ b/src/isdn/ip.ycp @@ -5,7 +5,6 @@ * Authors: Michal Svec * Karsten Keil * - * $Id$ */ { diff --git a/src/isdn/lowlevel.ycp b/src/isdn/lowlevel.ycp index 781fb772d..b78336670 100644 --- a/src/isdn/lowlevel.ycp +++ b/src/isdn/lowlevel.ycp @@ -11,7 +11,6 @@ * Authors: * Michal Svec * - * $Id$ * */ @@ -68,7 +67,6 @@ define list ISDNCards4Vendor(integer vendor, integer defcard) ``{ */ define any SelectISDNCard() ``{ - ScreenName("isdn-hardware-selection"); /* Manual selection caption */ string caption = _("Manual ISDN Card Selection"); diff --git a/src/isdn/routines.ycp b/src/isdn/routines.ycp index fb21224bc..8e14b2b8e 100644 --- a/src/isdn/routines.ycp +++ b/src/isdn/routines.ycp @@ -11,7 +11,6 @@ * Authors: * Karsten Keil * - * $Id$ * * * diff --git a/src/isdn/wizards.ycp b/src/isdn/wizards.ycp index 7198d7691..88c129ce5 100644 --- a/src/isdn/wizards.ycp +++ b/src/isdn/wizards.ycp @@ -4,7 +4,6 @@ * Summary: ISDN configuration wizards * Authors: Michal Svec * - * $Id$ */ { diff --git a/src/lan/address.ycp b/src/lan/address.ycp index d78c63f7c..8bbe01619 100644 --- a/src/lan/address.ycp +++ b/src/lan/address.ycp @@ -4,7 +4,6 @@ * Summary: Network card adresss configuration dialogs * Authors: Michal Svec * - * $Id$ */ { @@ -928,7 +927,6 @@ UI::ChangeWidget(`id("IFPLUGD_PRIORITY"), `Enabled, (UI::QueryWidget(`id("STARTM * @return dialog result */ define any AddressDialog() { - ScreenName("lan-address"); string fwzone = SuSEFirewall4Network::GetZoneOfInterface (LanItems::device); // If firewall is active and interface in no zone, nothing diff --git a/src/lan/cards.ycp b/src/lan/cards.ycp index fdfb31355..11f8989fa 100644 --- a/src/lan/cards.ycp +++ b/src/lan/cards.ycp @@ -4,7 +4,6 @@ * Summary: Network cards database * Authors: Michal Svec * - * $Id$ * * Originally copyied from yast1 NetCardDlg.cc. * diff --git a/src/lan/cmdline.ycp b/src/lan/cmdline.ycp index e53ca2753..4292ff8a3 100644 --- a/src/lan/cmdline.ycp +++ b/src/lan/cmdline.ycp @@ -4,7 +4,6 @@ * Summary: Network cards cmdline handlers * Authors: Michal Svec * - * $Id$ */ { diff --git a/src/lan/complex.ycp b/src/lan/complex.ycp index cce1f2c75..73e0e6c81 100644 --- a/src/lan/complex.ycp +++ b/src/lan/complex.ycp @@ -4,7 +4,6 @@ * Summary: Summary, overview and IO dialogs for network cards config * Authors: Michal Svec * - * $Id$ */ { @@ -59,8 +58,6 @@ define symbol Commit() ``{ */ define symbol ReadDialog() ``{ - ScreenName("lan-read"); - Wizard::RestoreHelp( help["read"]:"" ); Lan::AbortFunction = ``{return PollAbort();}; boolean ret = Lan::Read (`cache); @@ -88,7 +85,6 @@ See %1 for details."), "/usr/share/doc/packages/xen/README.SuSE"))) * @return `abort if aborted and `next otherwise */ define symbol WriteDialog() ``{ - ScreenName("lan-write"); if(!Lan::Modified()) return `next; diff --git a/src/lan/dhcp.ycp b/src/lan/dhcp.ycp index 008932b09..43176baab 100644 --- a/src/lan/dhcp.ycp +++ b/src/lan/dhcp.ycp @@ -4,7 +4,6 @@ * Summary: Network card adresss configuration dialogs * Authors: Michal Svec * - * $Id$ */ { diff --git a/src/lan/hardware.ycp b/src/lan/hardware.ycp index 8d2536dfe..86abb846c 100644 --- a/src/lan/hardware.ycp +++ b/src/lan/hardware.ycp @@ -4,7 +4,6 @@ * Summary: Hardware dialogs * Authors: Michal Svec * - * $Id$ */ { @@ -286,8 +285,6 @@ void initHwDialog(string text) { */ define any SelectionDialog() { - ScreenName("lan-hardware-selection"); - string type = LanItems::type; integer selected = 0; @@ -641,7 +638,6 @@ define any S390Dialog() { // already configured device (on hardware layer), skip this dialog if (size(LanItems::Items[LanItems::current, "hwinfo", "dev_name"]:"")>0) return `next; - ScreenName("lan-hardware-s390"); /* S/390 dialog caption */ string caption = _("S/390 Network Card Configuration"); diff --git a/src/lan/virtual.ycp b/src/lan/virtual.ycp index 29823c2a8..b4321de7f 100644 --- a/src/lan/virtual.ycp +++ b/src/lan/virtual.ycp @@ -4,7 +4,6 @@ * Summary: Multiple addresses dialogs * Authors: Michal Svec * - * $Id$ */ { @@ -161,8 +160,6 @@ void storeAdditional (string key, map event) { */ define term VirtualEditDialog(integer id, term entry, list forbidden) { - ScreenName("lan-virtual-edit"); - y2debug("id=%1", id); y2debug("entry=%1", entry); y2debug("forbidden=%1", forbidden); diff --git a/src/lan/wireless.ycp b/src/lan/wireless.ycp index e038e597c..2b622e0a8 100644 --- a/src/lan/wireless.ycp +++ b/src/lan/wireless.ycp @@ -4,7 +4,6 @@ * Summary: Wireless dialogs * Authors: Michal Svec * - * $Id$ */ { @@ -199,8 +198,6 @@ list AuthModeItems (list authmodes) { */ define any WirelessDialog() ``{ - ScreenName("lan-hardware-wireless"); - /* Wireless dialog caption */ string caption = _("Wireless Network Card Configuration"); string mode = LanItems::wl_mode; @@ -456,8 +453,6 @@ Really continue? */ define any WirelessExpertDialog() ``{ - ScreenName("lan-hardware-wireless-expert"); - /* Wireless expert dialog caption */ string caption = _("Wireless Expert Settings"); @@ -595,7 +590,6 @@ the channel, select the desired value.

* @param lengths allowed real key lengths */ define string WirelessKeyPopup (string tkey, list lengths) ``{ - ScreenName("lan-hardware-wireless-key"); map wkey = ParseWepKey (tkey); string key = wkey["key"]:""; @@ -705,8 +699,6 @@ define integer FindGoodDefault (list keys, integer defaultk) ``{ */ define any WirelessKeysDialog() ``{ - ScreenName("lan-hardware-wireless-keys"); - /* Wireless keys dialog caption */ string caption = _("Wireless Keys"); diff --git a/src/lan/wizards.ycp b/src/lan/wizards.ycp index 56e8939a9..70c26d77d 100644 --- a/src/lan/wizards.ycp +++ b/src/lan/wizards.ycp @@ -4,7 +4,6 @@ * Summary: Network cards configuration wizards * Authors: Michal Svec * - * $Id$ */ { diff --git a/src/modem/complex.ycp b/src/modem/complex.ycp index a4ce22fb8..7b2e36d1d 100644 --- a/src/modem/complex.ycp +++ b/src/modem/complex.ycp @@ -4,7 +4,6 @@ * Summary: Summary, overview and IO dialogs for modems configuration. * Authors: Michal Svec * - * $Id$ */ { @@ -62,8 +61,6 @@ define symbol FinishDialog() { */ define symbol ReadDialog() { - ScreenName("modem-read"); - /* modems read dialog help 1/2 */ string helptext = _("

Initializing Modem Configuration
Please wait...

"); @@ -99,8 +96,6 @@ You may want to use qinternet instead."); */ define symbol WriteDialog() { - ScreenName("modem-write"); - if(!Modified()) return `next; /* modems write dialog help 1/2 */ @@ -295,8 +290,6 @@ symbol HandleProviders (string widget_id, map event) */ define any OverviewDialog() { - ScreenName("modem-overview"); - /* Modems overview dialog caption */ string caption = _("Modem Configuration Overview"); diff --git a/src/modem/dialogs.ycp b/src/modem/dialogs.ycp index 01a94965c..57665b130 100644 --- a/src/modem/dialogs.ycp +++ b/src/modem/dialogs.ycp @@ -4,7 +4,6 @@ * Summary: Modem configuration dialogs * Authors: Michal Svec * - * $Id$ */ { @@ -31,8 +30,6 @@ define symbol ModemDialog(boolean detected) { if (!contains(Modem::Requires, "smartlink-softmodem")) Modem::Requires=add(Modem::Requires, "smartlink-softmodem"); } - ScreenName("modem-dialog"); - /* PREPARE VARIABLES */ /* FIXME make the Connection dialog optional in the provider dialog */ @@ -199,8 +196,6 @@ initialization strings.

"); */ define symbol ModemDetailsDialog() { - ScreenName("modem-details"); - /* PREPARE VARIABLES */ integer BaudRate = Modem::BaudRate; string Init1 = Modem::Init1; diff --git a/src/modem/wizards.ycp b/src/modem/wizards.ycp index 238f760cc..ba94f9f15 100644 --- a/src/modem/wizards.ycp +++ b/src/modem/wizards.ycp @@ -4,7 +4,6 @@ * Summary: Modem configuration wizards * Authors: Michal Svec * - * $Id$ */ { diff --git a/src/modules/DNS.ycp b/src/modules/DNS.ycp index fc66930e3..190b2c93a 100644 --- a/src/modules/DNS.ycp +++ b/src/modules/DNS.ycp @@ -4,7 +4,6 @@ * Summary: Hostname and DNS data * Authors: Michal Svec * - * $Id$ * * Manages resolv.conf and (fully qualified) hostname, also * respecting DHCP. diff --git a/src/modules/DSL.ycp b/src/modules/DSL.ycp index 6a101be27..fda448fa2 100644 --- a/src/modules/DSL.ycp +++ b/src/modules/DSL.ycp @@ -4,7 +4,6 @@ * Summary: DSL data * Authors: Michal Svec * - * $Id$ * * Representation of the configuration of DSL. * Input and output routines. diff --git a/src/modules/Host.ycp b/src/modules/Host.ycp index 60b1d6c99..ce387db97 100644 --- a/src/modules/Host.ycp +++ b/src/modules/Host.ycp @@ -4,7 +4,6 @@ * Summary: Hosts data (/etc/hosts) * Authors: Michal Svec * - * $Id$ */ { diff --git a/src/modules/ISDN.ycp b/src/modules/ISDN.ycp index 6ad2e5407..ad32cfd8d 100644 --- a/src/modules/ISDN.ycp +++ b/src/modules/ISDN.ycp @@ -5,7 +5,6 @@ * Authors: Michal Svec * Karsten Keil * - * $Id$ * * Representation of the configuration of ISDN. * Input and output routines. diff --git a/src/modules/InternetDevices.ycp b/src/modules/InternetDevices.ycp index cc7f6ffb3..1e69602ad 100644 --- a/src/modules/InternetDevices.ycp +++ b/src/modules/InternetDevices.ycp @@ -5,7 +5,6 @@ * Authors: Michal Svec * Arvin Schnell * - * $Id$ */ { diff --git a/src/modules/Lan.ycp b/src/modules/Lan.ycp index 3eb923f20..e485afaf9 100644 --- a/src/modules/Lan.ycp +++ b/src/modules/Lan.ycp @@ -4,7 +4,6 @@ * Summary: Network card data * Authors: Michal Svec * - * $Id$ * * Representation of the configuration of network cards. * Input and output routines. diff --git a/src/modules/LanUdevAuto.ycp b/src/modules/LanUdevAuto.ycp index b67ba5b82..cb6c06cf0 100644 --- a/src/modules/LanUdevAuto.ycp +++ b/src/modules/LanUdevAuto.ycp @@ -4,7 +4,6 @@ * Summary: Udev rules for autoinstallation * Authors: Michal Zugec * - * $Id: Lan.ycp 40537 2007-08-28 13:22:01Z mzugec $ * * Representation of the configuration of network cards. */ diff --git a/src/modules/Modem.ycp b/src/modules/Modem.ycp index 7a9b00243..2c6c204f8 100644 --- a/src/modules/Modem.ycp +++ b/src/modules/Modem.ycp @@ -4,7 +4,6 @@ * Summary: Modem data * Authors: Michal Svec * - * $Id$ * * Representation of the configuration of modem. * Input and output routines. diff --git a/src/modules/NetHwDetection.ycp b/src/modules/NetHwDetection.ycp index d4281105d..e986e7639 100644 --- a/src/modules/NetHwDetection.ycp +++ b/src/modules/NetHwDetection.ycp @@ -4,7 +4,6 @@ * Summary: Network detection * Authors: Michal Svec * - * $Id$ * *

Detects network settings, using dhcp or sniffing network traffic

* diff --git a/src/modules/Network.ycp b/src/modules/Network.ycp index eafa24295..88ca509fc 100644 --- a/src/modules/Network.ycp +++ b/src/modules/Network.ycp @@ -4,7 +4,6 @@ * Summary: Network data * Authors: Michal Svec * - * $Id$ * * Representation of the configuration of network. * Input and output routines. diff --git a/src/modules/NetworkStorage.ycp b/src/modules/NetworkStorage.ycp index 7ec59ad6c..b7b82e898 100644 --- a/src/modules/NetworkStorage.ycp +++ b/src/modules/NetworkStorage.ycp @@ -4,7 +4,6 @@ * Summary: Networked disks * Authors: Martin Vidner * - * $Id: NetworkStorage.ycp 38154 2007-05-28 08:20:39Z mzugec $ * * #176804 - Root on iSCSI installation fails */ diff --git a/src/modules/Provider.ycp b/src/modules/Provider.ycp index 13d99b356..a1a6380ba 100644 --- a/src/modules/Provider.ycp +++ b/src/modules/Provider.ycp @@ -6,7 +6,6 @@ * Petr Blahos * Michal Svec * - * $Id$ * * Used by Modem, ISDN, DSL. * The provider data is grouped by country. There are predefined ones diff --git a/src/modules/Remote.ycp b/src/modules/Remote.ycp index 88f5521c0..617135564 100644 --- a/src/modules/Remote.ycp +++ b/src/modules/Remote.ycp @@ -5,7 +5,6 @@ * Authors: Arvin Schnell * Martin Vidner * - * $Id$ * */ diff --git a/src/modules/Routing.ycp b/src/modules/Routing.ycp index 03a702acd..6f7a6cd84 100644 --- a/src/modules/Routing.ycp +++ b/src/modules/Routing.ycp @@ -4,7 +4,6 @@ * Summary: Routing data (/etc/sysconfig/network/routes) * Authors: Michal Svec * - * $Id$ * * See routes(5) * Does not work with interface-specific routes yet (ifroute-lo...) diff --git a/src/modules/SuSEFirewall4Network.ycp b/src/modules/SuSEFirewall4Network.ycp index 49cbc43a8..331571c06 100644 --- a/src/modules/SuSEFirewall4Network.ycp +++ b/src/modules/SuSEFirewall4Network.ycp @@ -6,7 +6,6 @@ * Summary: Module for handling interfaces in SuSEfirewall2 * Authors: Lukas Ocilka * - * $Id$ * * Module for handling network interfaces in SuSEfirewall2 using SuSEFirewall * module. diff --git a/src/provider/complex.ycp b/src/provider/complex.ycp index 7dca1d162..cc49217e5 100644 --- a/src/provider/complex.ycp +++ b/src/provider/complex.ycp @@ -4,7 +4,6 @@ * Summary: Complex providers dialogs * Authors: Michal Svec * - * $Id$ */ { @@ -34,7 +33,6 @@ define symbol CommitProvider() { * @return `abort if aborted and `next otherwise */ define symbol ReadDialog() { - ScreenName("provider-read"); Wizard::RestoreHelp(HELPS["read"]:""); // Provider::AbortFunction = ``{return PollAbort();}; boolean ret = Provider::Read(); @@ -46,7 +44,6 @@ define symbol ReadDialog() { * @return `abort if aborted and `next otherwise */ define symbol WriteDialog() { - ScreenName("provider-write"); if(!Modified()) return `next; Wizard::RestoreHelp(HELPS["write"]:""); // Provider::AbortFunction = ``{return PollAbort() && ReallyAbort();}; @@ -60,8 +57,6 @@ define symbol WriteDialog() { */ define any TypeDialog() { - ScreenName("provider-type"); - /* Provider type dialog caption */ string caption = _("Provider Type"); @@ -133,8 +128,6 @@ define any TypeDialog() { */ define any OverviewDialog() { - ScreenName("provider-overview"); - /* Provider overview dialog help caption */ string caption = _("Provider Overview"); diff --git a/src/provider/connection.ycp b/src/provider/connection.ycp index a75926045..6c6f54295 100644 --- a/src/provider/connection.ycp +++ b/src/provider/connection.ycp @@ -4,7 +4,6 @@ * Summary: Connection configuration dialogs * Authors: Michal Svec * - * $Id$ */ { @@ -22,14 +21,14 @@ import "Provider"; import "SuSEFirewall4Network"; import "Wizard"; +include "network/routines.ycp"; + /** * Connection dialog * @return dialog result */ define any ConnectionDialog() { - ScreenName("provider-connection"); - string type = Provider::Type; /* PREPARE VARIABLES */ diff --git a/src/provider/details.ycp b/src/provider/details.ycp index c8c083089..391d91285 100644 --- a/src/provider/details.ycp +++ b/src/provider/details.ycp @@ -4,7 +4,6 @@ * Summary: Provider details configuration dialogs * Authors: Michal Svec * - * $Id$ */ { @@ -25,8 +24,6 @@ include "network/routines.ycp"; */ define any IPDetailsDialog() ``{ - ScreenName("provider-details"); - /* PREPARE VARIABLES */ string type = Provider::Type; diff --git a/src/provider/dialogs.ycp b/src/provider/dialogs.ycp index 8a63ac5f8..3538b86d7 100644 --- a/src/provider/dialogs.ycp +++ b/src/provider/dialogs.ycp @@ -6,7 +6,6 @@ * Petr Blahos * Dan Vesely * - * $Id$ */ { @@ -50,7 +49,6 @@ define any dividerHack(list provs, any prev) { */ define any ProvidersDialog(boolean edit) { - ScreenName("provider-list"); string type = Provider::Type; y2security("type=%1", type); diff --git a/src/provider/helps.ycp b/src/provider/helps.ycp index 522ac817a..91543e532 100644 --- a/src/provider/helps.ycp +++ b/src/provider/helps.ycp @@ -4,7 +4,6 @@ * Summary: Provider dialog helps * Authors: Michal Svec * - * $Id$ */ { diff --git a/src/provider/provider.ycp b/src/provider/provider.ycp index 5bee6d01b..e4cdb2642 100644 --- a/src/provider/provider.ycp +++ b/src/provider/provider.ycp @@ -4,7 +4,6 @@ * Summary: Provider dialogs * Authors: Michal Svec * - * $Id$ */ { @@ -86,8 +85,6 @@ dialing number, call the hot line %2.

*/ define any ProviderDialog() ``{ - ScreenName("provider-dialog"); - string type = Provider::Type; string name = Provider::Current["PROVIDER"]:""; diff --git a/src/provider/texts.ycp b/src/provider/texts.ycp index af25c9c96..dbbf073bd 100644 --- a/src/provider/texts.ycp +++ b/src/provider/texts.ycp @@ -4,7 +4,6 @@ * Summary: Provider specific texts * Authors: Michal Svec * - * $Id$ */ { diff --git a/src/provider/wizards.ycp b/src/provider/wizards.ycp index 80a978873..1d57b9f48 100644 --- a/src/provider/wizards.ycp +++ b/src/provider/wizards.ycp @@ -4,7 +4,6 @@ * Summary: Provider configuration wizards * Authors: Michal Svec * - * $Id$ * * Wizards definitions. */ diff --git a/src/remote/dialogs.ycp b/src/remote/dialogs.ycp index 08e83a754..941db165e 100644 --- a/src/remote/dialogs.ycp +++ b/src/remote/dialogs.ycp @@ -4,7 +4,6 @@ * Summary: Dialog for Remote Administration * Authors: Arvin Schnell * - * $Id$ */ { @@ -16,16 +15,12 @@ import "Remote"; import "Wizard"; import "CWMFirewallInterfaces"; -include "network/routines.ycp"; - /** * Remote administration dialog * @return dialog result */ define symbol RemoteMainDialog() { - ScreenName("remote"); - /* Ramote Administration dialog caption */ string caption = _("Remote Administration"); diff --git a/src/routines/complex.ycp b/src/routines/complex.ycp index b3ea4b121..82019e3f0 100644 --- a/src/routines/complex.ycp +++ b/src/routines/complex.ycp @@ -4,7 +4,6 @@ * Summary: Summary and overview functions * Authors: Michal Svec * - * $Id$ * */ diff --git a/src/routines/devices.ycp b/src/routines/devices.ycp index bf0e07bc1..597a65f1a 100644 --- a/src/routines/devices.ycp +++ b/src/routines/devices.ycp @@ -4,7 +4,6 @@ * Summary: Device manipulation functions * Authors: Michal Svec * - * $Id$ * * All config settings are stored in a global variable Devices. * Deleted devices are in the global list DeletedDevices. diff --git a/src/routines/hardware.ycp b/src/routines/hardware.ycp index f364a6f9f..25c2beb84 100644 --- a/src/routines/hardware.ycp +++ b/src/routines/hardware.ycp @@ -4,7 +4,6 @@ * Summary: Hardware routines * Authors: Michal Svec * - * $Id$ * * All hardware settings are stored in a global variable Hardware. * diff --git a/src/routines/routines.ycp b/src/routines/routines.ycp index 3599c266b..c7cb37c9a 100644 --- a/src/routines/routines.ycp +++ b/src/routines/routines.ycp @@ -4,7 +4,6 @@ * Summary: Miscellaneous routines * Authors: Michal Svec * - * $Id$ */ { @@ -75,14 +74,6 @@ define boolean ReallyAbortCond(boolean modified) { */ } -/** - * Set screen shot name - * @param name screenshot name - */ -define void ScreenName(string name) { -// obsolete -} - /** * Progress::NextStage and Progress::Title combined into one function * @param title progressbar title diff --git a/src/routines/runtime.ycp b/src/routines/runtime.ycp index 02fc8dbb8..366a8c418 100644 --- a/src/routines/runtime.ycp +++ b/src/routines/runtime.ycp @@ -4,7 +4,6 @@ * Summary: Runtime routines * Authors: Michal Svec * - * $Id$ */ { diff --git a/src/routines/summary.ycp b/src/routines/summary.ycp index 345db020f..d310170d2 100644 --- a/src/routines/summary.ycp +++ b/src/routines/summary.ycp @@ -4,7 +4,6 @@ * Summary: Summary and overview functions * Authors: Michal Svec * - * $Id$ * * All config settings are stored in a global variable Devices. * All hardware settings are stored in a global variable Hardware. diff --git a/src/routines/widgets.ycp b/src/routines/widgets.ycp index dd31c8c50..6135c5111 100644 --- a/src/routines/widgets.ycp +++ b/src/routines/widgets.ycp @@ -4,7 +4,6 @@ * Summary: Widgets for CWM * Authors: Martin Vidner * - * $Id$ */ { diff --git a/src/services/dns.ycp b/src/services/dns.ycp index cb016901d..26b05768f 100644 --- a/src/services/dns.ycp +++ b/src/services/dns.ycp @@ -5,7 +5,6 @@ * Authors: Michal Svec * Martin Vidner * - * $Id$ */ { diff --git a/src/services/host.ycp b/src/services/host.ycp index 09ea152f9..71d2b72ba 100644 --- a/src/services/host.ycp +++ b/src/services/host.ycp @@ -4,7 +4,6 @@ * Summary: Hosts configuration dialogs * Authors: Michal Svec * - * $Id$ * * Hosts configuration dialogs */ @@ -56,8 +55,6 @@ define boolean HostSystemPopup(string host, boolean delete) { */ define symbol HostsMainDialog(boolean standalone) { - ScreenName("host"); - /* Hosts dialog caption */ string caption = _("Host Configuration"); @@ -290,8 +287,6 @@ define symbol HostsMainDialog(boolean standalone) { define term HostDialog(integer id, term entry) { - ScreenName("host-edit"); - y2debug("id=%1", id); y2debug("entry=%1", entry); //y2debug("forbidden=%1", forbidden); diff --git a/src/services/routing.ycp b/src/services/routing.ycp index 903f01113..5e7a7a8f4 100644 --- a/src/services/routing.ycp +++ b/src/services/routing.ycp @@ -4,7 +4,6 @@ * Summary: Routing configuration dialogs * Authors: Michal Svec * - * $Id$ * * Routing configuration dialogs */