diff options
author | Thierry Vignaud <tvignaud@mandriva.org> | 2003-07-14 19:17:44 +0000 |
---|---|---|
committer | Thierry Vignaud <tvignaud@mandriva.org> | 2003-07-14 19:17:44 +0000 |
commit | 5d70e0b5c8db3e8c1c83ced00539c870044e1a0d (patch) | |
tree | 774ce3727081851ca48ec30ae791d0344f407fc4 | |
parent | ae726f144f5a05740921ae184b0a3b01ad2ead6c (diff) | |
download | drakx-5d70e0b5c8db3e8c1c83ced00539c870044e1a0d.tar drakx-5d70e0b5c8db3e8c1c83ced00539c870044e1a0d.tar.gz drakx-5d70e0b5c8db3e8c1c83ced00539c870044e1a0d.tar.bz2 drakx-5d70e0b5c8db3e8c1c83ced00539c870044e1a0d.tar.xz drakx-5d70e0b5c8db3e8c1c83ced00539c870044e1a0d.zip |
fix create_dialog() usage (who ever has changed its API should have altered
its callers)
-rwxr-xr-x | perl-install/standalone/drakfloppy | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/standalone/drakfloppy b/perl-install/standalone/drakfloppy index 32e27fe4d..4a6da3fcd 100755 --- a/perl-install/standalone/drakfloppy +++ b/perl-install/standalone/drakfloppy @@ -294,22 +294,22 @@ sub build_it() { } $co .= " " . $kernel_combo->entry->get_text; $co .= " 2>&1 |"; - create_dialog(N("Warning"), N("Be sure a media is present for the device %s", $device_combo->entry->get_text), 1) or return; + create_dialog(N("Warning"), N("Be sure a media is present for the device %s", $device_combo->entry->get_text), { cancel => 1 }) or return; # we test if the media is present test: my $a = "dd count=1 if=/dev/null of=" . $device_combo->entry->get_text . " 2>&1"; my $b = `$a`; if ($b =~ /dd/) { - create_dialog(N("Error"), N("There is no medium or it is write-protected for device %s.\nPlease insert one.", $device_combo->entry->get_text), 1) ? goto test : return 0; + create_dialog(N("Error"), N("There is no medium or it is write-protected for device %s.\nPlease insert one.", $device_combo->entry->get_text), { cancel => 1 }) ? goto test : return 0; } local *STATUS; - open STATUS, $co or do { create_dialog(N("Error"), N("Unable to fork: %s", $!), 0); return }; + open STATUS, $co or do { create_dialog(N("Error"), N("Unable to fork: %s", $!)); return }; local $_; while (<STATUS>) { gtktext_append($output, [ [ $_ ] ]); } - close STATUS or create_dialog(N("Error"), N("Unable to properly close mkbootdisk: \n %s \n %s", $!, $?), 0); + close STATUS or create_dialog(N("Error"), N("Unable to properly close mkbootdisk: \n %s \n %s", $!, $?)); return (0); } |