diff options
| author | Till Kamppeter <tkamppeter@mandriva.com> | 2003-02-04 19:05:42 +0000 |
|---|---|---|
| committer | Till Kamppeter <tkamppeter@mandriva.com> | 2003-02-04 19:05:42 +0000 |
| commit | cb8c8c4d4b04fc9601b7db400aeeff65430c2a04 (patch) | |
| tree | 882474309813c750ee3b930b4afcb59e85a101cc /perl-install/printer/printerdrake.pm | |
| parent | a32d31373f9198b23459518bcde8a333e643f7f7 (diff) | |
| download | drakx-cb8c8c4d4b04fc9601b7db400aeeff65430c2a04.tar drakx-cb8c8c4d4b04fc9601b7db400aeeff65430c2a04.tar.gz drakx-cb8c8c4d4b04fc9601b7db400aeeff65430c2a04.tar.bz2 drakx-cb8c8c4d4b04fc9601b7db400aeeff65430c2a04.tar.xz drakx-cb8c8c4d4b04fc9601b7db400aeeff65430c2a04.zip | |
- "Out-sourced" functions for config file handling into handle_configs.pm,
it is used by both printerdrake and scannerdrake.
- Improvements and fixes on CUPS daemon configuration by printerdrake.
Diffstat (limited to 'perl-install/printer/printerdrake.pm')
| -rw-r--r-- | perl-install/printer/printerdrake.pm | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm index e5b028fd1..2389dac79 100644 --- a/perl-install/printer/printerdrake.pm +++ b/perl-install/printer/printerdrake.pm @@ -84,7 +84,9 @@ sub config_cups { [ { text => N("The printers on this machine are available to other computers"), type => 'bool', val => \$printer->{cupsconfig}{localprintersshared} }, - { val => N("Local printers available on: ") . + { text => N("Automatically find available printers on remote machines"), type => 'bool', + val => \$printer->{cupsconfig}{remotebroadcastsaccepted} }, + { val => N("Printer sharing on hosts/networks: ") . ($printer->{cupsconfig}{customsharingsetup} ? N("Custom configuration") : ($#{$sharehosts->{list}} >= 0 ? @@ -98,10 +100,9 @@ sub config_cups { 1; }, disabled => sub { - (!$printer->{cupsconfig}{localprintersshared}); + (!$printer->{cupsconfig}{localprintersshared} && + !$printer->{cupsconfig}{remotebroadcastsaccepted}); } }, - { text => N("Automatically find available printers on remote machines"), type => 'bool', - val => \$printer->{cupsconfig}{remotebroadcastsaccepted} }, if_($::expert, { text => N("Automatic correction of CUPS configuration"), type => 'bool', @@ -288,10 +289,12 @@ N("192.168.100.0/255.255.255.0\n") # We have modified the configuration now $printer->{cupsconfig}{customsharingsetup} = 0; } - # If we have no entry in the list, we do not - # share the local printers, mark this - $printer->{cupsconfig}{localprintersshared} = - ($#{$printer->{cupsconfig}{clientnetworks}} >= 0); + } + # If we have no entry in the list, we do not + # share the local printers, mark this + if ($#{$printer->{cupsconfig}{clientnetworks}} < 0) { + $printer->{cupsconfig}{localprintersshared} = 0; + $printer->{cupsconfig}{remotebroadcastsaccepted} = 0; } } else { # We have clicked "OK" |