diff options
| author | Francois Pons <fpons@mandriva.com> | 2000-09-14 12:51:50 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2000-09-14 12:51:50 +0000 |
| commit | 44e8399e0fcfe979f36bdbf32e57740080413360 (patch) | |
| tree | 2cb888930d7ec2a2f97abc3e34f6a8b59eb63cb7 | |
| parent | 01fe21c3041836bf0d0d3fd1d08b3f54e3cdbfcf (diff) | |
| download | drakx-backup-do-not-use-44e8399e0fcfe979f36bdbf32e57740080413360.tar drakx-backup-do-not-use-44e8399e0fcfe979f36bdbf32e57740080413360.tar.gz drakx-backup-do-not-use-44e8399e0fcfe979f36bdbf32e57740080413360.tar.bz2 drakx-backup-do-not-use-44e8399e0fcfe979f36bdbf32e57740080413360.tar.xz drakx-backup-do-not-use-44e8399e0fcfe979f36bdbf32e57740080413360.zip | |
*** empty log message ***
| -rw-r--r-- | perl-install/Xconfigurator.pm | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index 5cd806b64..3c1de1982 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -461,13 +461,7 @@ sub testFinalConfig($;$$) { $ENV{DISPLAY} = ":9"; - my $background = "/usr/share/pixmaps/mdk/mandrake-logo.xpm"; - my $qiv = "/usr/bin/qiv"; - if ("$prefix/$background" && -x "$prefix/$qiv") { - system(($::testing ? "$prefix" : "chroot $prefix/ ") . "$qiv -y $background"); - } else { - gtkset_background(200 * 257, 210 * 257, 210 * 257); - } + gtkset_background(200 * 257, 210 * 257, 210 * 257); my ($h, $w) = Gtk::Gdk::Window->new_foreign(Gtk::Gdk->ROOT_WINDOW)->get_size; $my_gtk::force_position = [ $w / 3, $h / 2.4 ]; $my_gtk::force_focus = 1; @@ -479,6 +473,11 @@ sub testFinalConfig($;$$) { 1; }); + my $background = "/usr/share/pixmaps/mdk/mandrake-logo.xpm"; + my $qiv = "/usr/bin/qiv"; + -r "$prefix/$background" && -x "$prefix/$qiv" and + system(($::testing ? "$prefix" : "chroot $prefix/ ") . "$qiv -y $background"); + exit (interactive_gtk->new->ask_yesorno('', [ _("Is this the correct setting?"), $text ], 0) ? 0 : 222); }; my $rc = close F; |