summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2005-08-18 15:06:27 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2005-08-18 15:06:27 +0000
commit1a846cd6b3c3a8d224e7d4aee5711c39451142d6 (patch)
treecc5fa04eff945d691f86c3f2705415a85d5c49ec
parentbd4044479462649a08687575c579ff3632c6fc39 (diff)
downloaddrakx-1a846cd6b3c3a8d224e7d4aee5711c39451142d6.tar
drakx-1a846cd6b3c3a8d224e7d4aee5711c39451142d6.tar.gz
drakx-1a846cd6b3c3a8d224e7d4aee5711c39451142d6.tar.bz2
drakx-1a846cd6b3c3a8d224e7d4aee5711c39451142d6.tar.xz
drakx-1a846cd6b3c3a8d224e7d4aee5711c39451142d6.zip
- Removed stuff for automatic print queue setup when starting CUPS.
- Small menu text improvement.
-rw-r--r--perl-install/printer/main.pm6
-rw-r--r--perl-install/printer/printerdrake.pm8
2 files changed, 2 insertions, 12 deletions
diff --git a/perl-install/printer/main.pm b/perl-install/printer/main.pm
index ea9bbcb0e..30da7852d 100644
--- a/perl-install/printer/main.pm
+++ b/perl-install/printer/main.pm
@@ -742,8 +742,6 @@ sub set_auto_admin {
$printer->{autoqueuesetuponnewprinter} ? "yes" : "no";
$sysconfig{ENABLE_QUEUES_ON_SPOOLER_START} =
$printer->{enablequeuesonspoolerstart} ? "yes" : "no";
- $sysconfig{AUTO_SETUP_QUEUES_ON_SPOOLER_START} =
- $printer->{autoqueuesetuponspoolerstart} ? "yes" : "no";
$sysconfig{AUTO_SETUP_QUEUES_ON_PRINTERDRAKE_START} =
$printer->{autoqueuesetuponstart} ? "yes" : "no";
$sysconfig{AUTO_SETUP_QUEUES_MODE} =
@@ -766,10 +764,6 @@ sub get_auto_admin {
(!defined($sysconfig{ENABLE_QUEUES_ON_SPOOLER_START}) ||
($sysconfig{ENABLE_QUEUES_ON_SPOOLER_START} =~ /no/i) ?
0 : 1);
- $printer->{autoqueuesetuponspoolerstart} =
- (!defined($sysconfig{AUTO_SETUP_QUEUES_ON_SPOOLER_START}) ||
- ($sysconfig{AUTO_SETUP_QUEUES_ON_SPOOLER_START} =~ /yes/i) ?
- 1 : 0);
$printer->{autoqueuesetuponstart} =
(!defined($sysconfig{AUTO_SETUP_QUEUES_ON_PRINTERDRAKE_START}) ||
($sysconfig{AUTO_SETUP_QUEUES_ON_PRINTERDRAKE_START} =~ /yes/i) ?
diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm
index a12394bbd..2bc61a30a 100644
--- a/perl-install/printer/printerdrake.pm
+++ b/perl-install/printer/printerdrake.pm
@@ -611,9 +611,9 @@ sub config_auto_admin {
# Configuration dialog
my $waitforgui =
- N("Allow pop-up windows, package installation possible");
+ N("Allow pop-up windows, canceling setup and package installation possible");
my $nogui =
- N("No pop-up windows, package installation not possible");
+ N("No pop-up windows, canceling setup and package installation not possible");
my $autoqueuesetupmode =
($printer->{autoqueuesetupgui} && -x "/usr/X11R6/bin/X") ?
$waitforgui : $nogui;
@@ -627,9 +627,6 @@ sub config_auto_admin {
{ text => N("when a USB printer is connected and turned on"),
type => 'bool',
val => \$printer->{autoqueuesetuponnewprinter} },
- { text => N("when the printing system is started"),
- type => 'bool',
- val => \$printer->{autoqueuesetuponspoolerstart} },
{ text => N("when Printerdrake is started"),
type => 'bool',
val => \$printer->{autoqueuesetuponstart} },
@@ -1118,7 +1115,6 @@ sub turnoffautosetup {
printer::main::get_auto_admin($printer);
# Turn off automatic print queue setup
$printer->{autoqueuesetuponnewprinter} = 0;
- $printer->{autoqueuesetuponspoolerstart} = 0;
$printer->{autoqueuesetuponstart} = 0;
# Save new settings
printer::main::set_auto_admin($printer);