summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-05-02 15:14:59 +0000
committerThierry Vignaud <tv@mageia.org>2013-05-02 15:14:59 +0000
commit5da4ba4db4c63059d26be6ad750c6029034e5da1 (patch)
tree99d987a62f02b25d5aa75a9a1ce5cb3d69dbc69b
parent7f5b80ba42278945cbc8088e31124d52d66f2d9f (diff)
downloaddrakx-5da4ba4db4c63059d26be6ad750c6029034e5da1.tar
drakx-5da4ba4db4c63059d26be6ad750c6029034e5da1.tar.gz
drakx-5da4ba4db4c63059d26be6ad750c6029034e5da1.tar.bz2
drakx-5da4ba4db4c63059d26be6ad750c6029034e5da1.tar.xz
drakx-5da4ba4db4c63059d26be6ad750c6029034e5da1.zip
fix displaying ads (mga#9939)
regression introduced in commit r8029 on 2013-04-26: "fix doble logging of 'filesystem' installation (mga#7758)"
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/steps_gtk.pm3
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 79120fe0e..5c9157aa6 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- fix displaying ads (mga#9939)
+
Version 15.48 - 1 May 2013
- include mount options in auto_inst.pl
diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm
index da6f0b013..77796072f 100644
--- a/perl-install/install/steps_gtk.pm
+++ b/perl-install/install/steps_gtk.pm
@@ -630,13 +630,14 @@ sub installPackages {
$o->{install_start_time} = 0;
mygtk2::gtkadd($pkg_log_widget, text => P("%d package", "%d packages", $nb, $nb));
$w->flush;
+ } elsif ($type eq 'open') {
+ $advertize->(1) if $show_advertising && $total_size > 20_000_000 && time() - $change_time > 20;
} elsif ($type eq 'inst' && $subtype eq 'start') {
gtkval_modify(\$pkg_progress, 0);
my $p = $packages->{depslist}[$id];
mygtk2::gtkadd($pkg_log_widget, text => sprintf("\n%s: %s", $p->name, translate($p->summary)));
$current_total_size += $last_size;
$last_size = $p->size;
- $advertize->(1) if $show_advertising && $total_size > 20_000_000 && time() - $change_time > 20;
# display release notes if requested, when not chrooted:
if ($show_release_notes) {