From be8977a4b28f204b489cc20e1869a25a65b681ac Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Tue, 19 Aug 2008 13:31:06 +0000
Subject: (ask_fromW) use new style popup button for help

---
 perl-install/install/NEWS       | 1 +
 perl-install/interactive/gtk.pm | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 12ac7aba2..9ad556580 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,6 +1,7 @@
 - drakx-in-chroot:
   o enable to choose resolution of Xvfb
   o enable to use a package repository different from installer one
+- use new style popup button for help
 
 Version 11.15 - 19 August 2008
 
diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm
index 2e7593660..5a05874b8 100644
--- a/perl-install/interactive/gtk.pm
+++ b/perl-install/interactive/gtk.pm
@@ -742,7 +742,8 @@ sub ask_fromW {
 
     my @more_buttons = (
 			if_($common->{interactive_help}, 
-			    [ N("Help"), sub { 
+                            [ gtknew('Install_Button', text => N("Help"),
+                                     clicked => sub { 
                          if (my $file = $common->{interactive_help_id}) {
                              require Gtk2::Html2;
                              my $view     = Gtk2::Html2::View->new;
@@ -778,7 +779,7 @@ sub ask_fromW {
                          }
 				  my $message = $common->{interactive_help}->() or return;
 				  $o->ask_warn(N("Help"), $message);
-			      }, 1 ]),
+			      }), undef, 1 ]),
 			if_($common->{more_buttons}, @{$common->{more_buttons}}),
 		       );
     my $buttons_pack = ($common->{ok} || !exists $common->{ok}) && $mainw->create_okcancel($common->{ok}, $common->{cancel}, '', @more_buttons);
-- 
cgit v1.2.1