diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2002-07-04 15:48:18 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2002-07-04 15:48:18 +0000 |
| commit | 59762dffbe1c776e7fa2df35337bdb9fd6e9382a (patch) | |
| tree | cb073d9c3089c3deef710fff339f6a64ba4901bc /perl-install | |
| parent | 49e546efe25ba1e1ac210f0060f01e1a221fd462 (diff) | |
| download | drakx-59762dffbe1c776e7fa2df35337bdb9fd6e9382a.tar drakx-59762dffbe1c776e7fa2df35337bdb9fd6e9382a.tar.gz drakx-59762dffbe1c776e7fa2df35337bdb9fd6e9382a.tar.bz2 drakx-59762dffbe1c776e7fa2df35337bdb9fd6e9382a.tar.xz drakx-59762dffbe1c776e7fa2df35337bdb9fd6e9382a.zip | |
remove wait_message hack for printerdraker, better use class_discard
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/harddrake/data.pm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm index b4f87025d..21dbb68f0 100644 --- a/perl-install/harddrake/data.pm +++ b/perl-install/harddrake/data.pm @@ -7,14 +7,13 @@ use lib qw(/usr/lib/libDrakX); use vars qw(@ISA @EXPORT_OK); use detect_devices; use MDK::Common; +use class_discard; @ISA = qw(Exporter); @EXPORT_OK = (qw(version tree)); our ($version, $sbindir) = ("1.1.5", "/usr/sbin/"); -sub wait_message {} #- needed to emulate $in required by printerdrake::auto_detect as argument - # Update me each time you handle one more devices class (aka configurator) sub unknown { grep { $_->{media_type} !~ /tape|DISPLAY|MULTIMEDIA_VIDEO|BRIDGE|NETWORK|MULTIMEDIA_AUDIO/ } detect_devices::probeall(1); @@ -62,7 +61,7 @@ our @tree = ["UNKNOWN","Unknown/Others", "unknown.png", "" , \&unknown], ["PRINTER","Printer", "hw_printer.png", "$sbindir/printerdrake", - sub { require printerdrake; printerdrake::auto_detect(bless {}) } ], + sub { require printerdrake; printerdrake::auto_detect(class_discard->new) } ], ["SCANNER","Scanner", "scanner.png", "$sbindir/scannerdrake", sub { require scanner; scanner::findScannerUsbport() }], ["MOUSE","Mouse", "hw_mouse.png", "$sbindir/mousedrake", sub { use mouse; &mouse::detect()}], |