diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2003-01-22 17:21:52 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2003-01-22 17:21:52 +0000 |
| commit | 2ba36d6f841d9e6fa5249b9323f74a10b05d468b (patch) | |
| tree | 4d26e8385be27bcce993432023ae4b6410c1a9e1 | |
| parent | da3f8c2c6c48923b32b40e062f6a6692e0cef6ff (diff) | |
| download | drakx-2ba36d6f841d9e6fa5249b9323f74a10b05d468b.tar drakx-2ba36d6f841d9e6fa5249b9323f74a10b05d468b.tar.gz drakx-2ba36d6f841d9e6fa5249b9323f74a10b05d468b.tar.bz2 drakx-2ba36d6f841d9e6fa5249b9323f74a10b05d468b.tar.xz drakx-2ba36d6f841d9e6fa5249b9323f74a10b05d468b.zip | |
correctly pop when F2 (screenshots)
| -rw-r--r-- | perl-install/common.pm | 5 | ||||
| -rw-r--r-- | perl-install/ugtk2.pm | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/perl-install/common.pm b/perl-install/common.pm index f486660d4..7feadc532 100644 --- a/perl-install/common.pm +++ b/perl-install/common.pm @@ -165,18 +165,17 @@ sub screenshot_dir__and_move { } sub take_screenshot { - my ($in) = @_; my $dir = screenshot_dir__and_move() . '/DrakX-screenshots'; my $warn; if (!-e $dir) { - mkdir $dir or $in->ask_warn('', N("Can't make screenshots before partitioning")), return; + mkdir $dir or $::o->ask_warn('', N("Can't make screenshots before partitioning")), return; $warn = 1; } my $nb = 1; $nb++ while -e "$dir/$nb.png"; system("fb2png /dev/fb0 $dir/$nb.png 0"); - $in->ask_warn('', N("Screenshots will be available after install in %s", "/root/DrakX-screenshots")) if $warn; + $::o->ask_warn('', N("Screenshots will be available after install in %s", "/root/DrakX-screenshots")) if $warn; } sub join_lines { diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm index 4b6a1f36b..dbfdb1747 100644 --- a/perl-install/ugtk2.pm +++ b/perl-install/ugtk2.pm @@ -742,7 +742,7 @@ sub new { require install_gtk; install_gtk::create_big_help($::o); } elsif ($d eq 'screenshot') { - common::take_screenshot($o); + common::take_screenshot(); } elsif (chr($event->keyval) eq 'e' && member('mod1-mask', @{$event->state})) { #- alt-e log::l("Switching to " . ($::expert ? "beginner" : "expert")); $::expert = !$::expert; |