summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2009-02-26 18:11:41 +0000
committerPascal Terjan <pterjan@mandriva.org>2009-02-26 18:11:41 +0000
commitb65c42273a1b729965a1417c952d2c3a6615c47f (patch)
tree06db73c1a49ef4746fe951c7470e8582bedaac23
parentc20aa848515dd24f47263bcf086696fab6945d09 (diff)
downloaddrakx-b65c42273a1b729965a1417c952d2c3a6615c47f.tar
drakx-b65c42273a1b729965a1417c952d2c3a6615c47f.tar.gz
drakx-b65c42273a1b729965a1417c952d2c3a6615c47f.tar.bz2
drakx-b65c42273a1b729965a1417c952d2c3a6615c47f.tar.xz
drakx-b65c42273a1b729965a1417c952d2c3a6615c47f.zip
drakdvb: use do_pkgs directly
-rwxr-xr-xperl-install/standalone/drakdvb3
-rw-r--r--perl-install/ugtk2.pm2
2 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/standalone/drakdvb b/perl-install/standalone/drakdvb
index 448f82c9e..bd1b8dcaa 100755
--- a/perl-install/standalone/drakdvb
+++ b/perl-install/standalone/drakdvb
@@ -60,6 +60,8 @@ sub detect_channels() {
$channel_list->set_sensitive(0);
$_->set_sensitive(0) foreach values %buttons;
+ $in->do_pkgs->install('w_scan');
+
gtkflush();
$SIG{CHLD} = sub {
@@ -87,7 +89,6 @@ sub detect_channels() {
} else {
$SIG{CHLD} = 'DEFAULT';
mkdir_p(dirname($config_file));
- system('/usr/sbin/drakhelp_inst w_scan') unless -e '/usr/bin/w_scan';
my $ret = system("w_scan -X > $config_file");
sleep(1);
POSIX::_exit($ret >> 8);
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm
index 05e361253..3ab3d7b37 100644
--- a/perl-install/ugtk2.pm
+++ b/perl-install/ugtk2.pm
@@ -858,7 +858,7 @@ sub create_file_selector {
add2hash(\%opts, { width => 480, height => 250 });
gtkadd($w->{window},
gtkpack_(create_box_with_title($w, $message),
- 1, $w->{chooser} = gtknew('FileChooser', action => $action, %opts),
+ 1, $w->{chooser} = gtknew('FileChooserWidget', action => $action, %opts),
0, create_okcancel($w),
));
$w->{chooser}->signal_connect(file_activated => sub { $w->{ok}->clicked });