summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_gtk.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-09-15 13:13:51 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-09-15 13:13:51 +0000
commit9195d8353a59ffe9b9e8fd63a5b751c418307710 (patch)
tree59c421962850b5468185f9b9b444e7470ba04e49 /perl-install/install_steps_gtk.pm
parent52844ed39b1d2e17b13f7206892a3c65de93cc2a (diff)
downloaddrakx-9195d8353a59ffe9b9e8fd63a5b751c418307710.tar
drakx-9195d8353a59ffe9b9e8fd63a5b751c418307710.tar.gz
drakx-9195d8353a59ffe9b9e8fd63a5b751c418307710.tar.bz2
drakx-9195d8353a59ffe9b9e8fd63a5b751c418307710.tar.xz
drakx-9195d8353a59ffe9b9e8fd63a5b751c418307710.zip
- call installCallback() on "open" too
- on "open" we are not chrooted - setting advertising when chrooted could cause havoc if pango wants to load a new font (eg: advertising #13 in pt_BR)
Diffstat (limited to 'perl-install/install_steps_gtk.pm')
-rw-r--r--perl-install/install_steps_gtk.pm3
1 files changed, 1 insertions, 2 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 73369e4f4..864f1f6dc 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -442,7 +442,6 @@ sub installPackages {
$change_time = time();
my $f = $install_any::advertising_images[$i++ % @install_any::advertising_images];
- $f =~ s/\Q$::prefix// if ! -f $f;
log::l("advertising $f");
gtkval_modify(\$advertising_image, $f);
@@ -502,7 +501,7 @@ sub installPackages {
$start_time = time();
mygtk2::gtkadd($pkg_log_widget, text => N("%d packages", $nb));
$w->flush;
- } elsif ($type eq 'inst' && $subtype eq 'start') {
+ } elsif ($type eq 'open') {
gtkval_modify(\$pkg_progress, 0);
my $p = $packages->{depslist}[$id];
mygtk2::gtkadd($pkg_log_widget, text => sprintf("\n%s: %s", $p->name, (split /\n/, c::from_utf8($p->summary))[0] || ''));