summaryrefslogtreecommitdiffstats
path: root/perl-install/install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-09-14 15:56:16 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-09-14 15:56:16 +0000
commit9f87ea734b52d737a18dda394afc5f4493bf6a40 (patch)
tree733297585537a50017f160663a1511728e69caaf /perl-install/install
parent8e69642c2e7afd3f06a492f0e71df4964cdfd06a (diff)
downloaddrakx-9f87ea734b52d737a18dda394afc5f4493bf6a40.tar
drakx-9f87ea734b52d737a18dda394afc5f4493bf6a40.tar.gz
drakx-9f87ea734b52d737a18dda394afc5f4493bf6a40.tar.bz2
drakx-9f87ea734b52d737a18dda394afc5f4493bf6a40.tar.xz
drakx-9f87ea734b52d737a18dda394afc5f4493bf6a40.zip
advertising: drop support for .pl files, only {title} was still supported, and it's unused
Diffstat (limited to 'perl-install/install')
-rw-r--r--perl-install/install/any.pm2
-rw-r--r--perl-install/install/steps_gtk.pm8
2 files changed, 0 insertions, 10 deletions
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index 15e58d428..82d7048a5 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -1293,8 +1293,6 @@ sub copy_advertising {
foreach (@files) {
chomp;
install::media::getAndSaveFile_($o->{stage2_phys_medium}, "$source_dir/$_", "$dir/$_");
- (my $pl = $_) =~ s/\.png/.pl/;
- install::media::getAndSaveFile_($o->{stage2_phys_medium}, "$source_dir/$pl", "$dir/$pl");
}
@advertising_images = map { "$dir/$_" } @files;
}
diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm
index dd3a96d8d..3501b7f73 100644
--- a/perl-install/install/steps_gtk.pm
+++ b/perl-install/install/steps_gtk.pm
@@ -484,14 +484,6 @@ sub installPackages {
my $f = $install::any::advertising_images[$i++ % @install::any::advertising_images];
log::l("advertising $f");
gtkval_modify(\$advertising_image, $f);
-
- if (my $banner = $w->{window}{banner}) {
- my ($title);
- my $pl = $f; $pl =~ s/\.png$/.pl/;
- eval(cat_($pl)) if -e $pl;
- $banner->{text} = $title;
- Gtk2::Banner::set_pixmap($banner);
- }
};
my $cancel = gtknew('Button', text => N("Cancel"), clicked => sub { $install::pkgs::cancel_install = 1 });