diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2002-11-20 15:23:47 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2002-11-20 15:23:47 +0000 |
| commit | cb997adfe9fbe9921a582a4fac99ff0a0aae53b8 (patch) | |
| tree | 8393b78e81811815df5753cf58da354325adc509 | |
| parent | d2a8094a820d928bbc4b5037c373f15e24ec7ee3 (diff) | |
| download | drakx-cb997adfe9fbe9921a582a4fac99ff0a0aae53b8.tar drakx-cb997adfe9fbe9921a582a4fac99ff0a0aae53b8.tar.gz drakx-cb997adfe9fbe9921a582a4fac99ff0a0aae53b8.tar.bz2 drakx-cb997adfe9fbe9921a582a4fac99ff0a0aae53b8.tar.xz drakx-cb997adfe9fbe9921a582a4fac99ff0a0aae53b8.zip | |
send_mail_pb() and client_ftp_pb() were just identical (modulo their
label)
| -rwxr-xr-x | perl-install/standalone/drakbackup | 59 |
1 files changed, 23 insertions, 36 deletions
diff --git a/perl-install/standalone/drakbackup b/perl-install/standalone/drakbackup index 37ecb6f7d..3e935af10 100755 --- a/perl-install/standalone/drakbackup +++ b/perl-install/standalone/drakbackup @@ -4200,30 +4200,39 @@ sub button_box_main { ################################################ MESSAGES ################################################ -sub send_mail_pb { +sub dialog_one { $table->destroy(); + my ($label) = @_; my ($pix_warn_map, $pix_warn_mask) = gtkcreate_png('warning'); gtkadd($advanced_box, - $box2 = gtkpack_(new Gtk::HBox(0, 15), - 1, new Gtk::VBox(0, 5), - 0, gtkpack_(new Gtk::HBox(0, 15), - 0, new Gtk::VBox(0, 5), - 0, new Gtk::Pixmap($pix_warn_map, $pix_warn_mask), - 0, N("Error during sendmail. - Your report mail was not sent. - Please configure sendmail"), - ), - 0, new Gtk::VBox(0, 5), - 1, new Gtk::VBox(0, 5), - ), - ); + $box2 = gtkpack_(new Gtk::HBox(0, 15), + 1, new Gtk::VBox(0, 5), + 0, gtkpack_(new Gtk::HBox(0, 15), + 0, new Gtk::VBox(0, 5), + 0, new Gtk::Pixmap($pix_warn_map, $pix_warn_mask), + 0, $label), + 0, new Gtk::VBox(0, 5), + 1, new Gtk::VBox(0, 5), + ), + ); button_box_restore_main(); $custom_help = "mail_pb"; $central_widget = \$box2; $up_box->show_all(); } +sub send_mail_pb { + dialog_one(N("Error during sendmail. + Your report mail was not sent. + Please configure sendmail")); +} + +sub client_ftp_pb { + dialog_one(N("Error during sending file via FTP. + Please correct your FTP configuration.")); +} + sub install_rpm { my ($previous_function) = @_; #- catch a crash when calling help @@ -4247,28 +4256,6 @@ sub install_rpm { $up_box->show_all(); } -sub client_ftp_pb { - $table->destroy(); - my ($pix_warn_map, $pix_warn_mask) = gtkcreate_png('warning'); - - gtkadd($advanced_box, - $box2 = gtkpack_(new Gtk::HBox(0, 15), - 1, new Gtk::VBox(0, 5), - 0, gtkpack_(new Gtk::HBox(0, 15), - 0, new Gtk::VBox(0, 5), - 0, new Gtk::Pixmap($pix_warn_map, $pix_warn_mask), - 0, N("Error during sending file via FTP. - Please correct your FTP configuration."), - ), - 0, new Gtk::VBox(0, 5), - 1, new Gtk::VBox(0, 5), - ), - ); - button_box_restore_main(); - $custom_help = "mail_pb"; - $central_widget = \$box2; - $up_box->show_all(); -} sub message_norestore_box { $box2->destroy(); |