From 9c46bcf3d81dd0a8fc5bcc9e8bef6eea6d384060 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Tue, 13 Jan 2004 17:45:11 +0000
Subject: sanitize buttons through reusing create_okcancel()

---
 perl-install/standalone/draksec | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

(limited to 'perl-install/standalone/draksec')

diff --git a/perl-install/standalone/draksec b/perl-install/standalone/draksec
index 7b53b96ad..c6d6afca4 100755
--- a/perl-install/standalone/draksec
+++ b/perl-install/standalone/draksec
@@ -227,8 +227,12 @@ $notebook->append_page(gtkshow(create_scrolled_window(gtkpack_(new Gtk2::VBox(0,
 
 
 ####################### OK CANCEL BUTTONS ##################################
-my $bok = gtksignal_connect(Gtk2::Button->new(N("Ok")),
-                            'clicked' => sub {
+gtkpack_($vbox,
+         1, gtkshow($notebook),
+         0, create_okcancel(my $oc =
+                            {
+                             cancel_clicked => sub { ugtk2->exit(0) },
+                             ok_clicked => sub {
                                 my $seclevel_value = $seclevel_entry->entry->get_text;
                                 my $secadmin_check_value = $secadmin_check->get_active;
                                 my $secadmin_value = $secadmin_entry->get_text;
@@ -272,21 +276,14 @@ my $bok = gtksignal_connect(Gtk2::Button->new(N("Ok")),
                                 remove_wait_msg($w);
 
                                 ugtk2->exit(0);
-                            });
-
-my $bcancel = gtksignal_connect(Gtk2::Button->new(N("Cancel")),
-                                'clicked' => sub { ugtk2->exit(0) });
-gtkpack_($vbox,
-         1, gtkshow($notebook),
-         0, gtkpack(Gtk2::HButtonBox->new,
-                    gtksignal_connect(Gtk2::Button->new(N("Help")), clicked => sub { unless (fork()) { exec("drakhelp --id draksec") } }),
-                    Gtk2::Label->new(""),
-                    $bcancel,
-                    $bok,
-                   ),
+                            }
+                            },
+                            undef, undef, '',
+                            [ N("Help"), sub { unless (fork()) { exec("drakhelp --id draksec") } } ],
+                           ),
         );
-$bcancel->can_default(1);
-$bcancel->grab_default;
+$oc->{cancel}->can_default(1);
+$oc->{cancel}->grab_default;
 
 $w->main;
 ugtk2->exit(0);
-- 
cgit v1.2.1