allow {interactive_help} per dialog boxes instead of global

2 files changed, 3 insertions, 2 deletions

diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm
index 55c1d5c45..26cfa8135 100644
--- a/perl-install/interactive.pm
+++ b/perl-install/interactive.pm
@@ -294,7 +294,7 @@ sub ask_from {
 
 
 sub ask_from_normalize {
-    my ($_o, $common, $l) = @_;
+    my ($o, $common, $l) = @_;
 
     ref($l) eq 'ARRAY' or internal_error('ask_from_normalize');
     foreach my $e (@$l) {
@@ -350,6 +350,7 @@ sub ask_from_normalize {
     if (!$common->{title} && $::isStandalone) {
 	($common->{title} = $0) =~ s|.*/||;
     }
+    $common->{interactive_help} ||= $o->{interactive_help};
     $common->{advanced_label} ||= N("Advanced");
     $common->{advanced_label_close} ||= N("Basic");
     $common->{$_} = [ deref($common->{$_}) ] foreach qw(messages advanced_messages);
diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm
index cc065ec01..be7d634c5 100644
--- a/perl-install/interactive/gtk.pm
+++ b/perl-install/interactive/gtk.pm
@@ -637,7 +637,7 @@ sub ask_fromW {
 	       0, Gtk2::HSeparator->new,
 	       1, $create_widgets->($advanced_total_size, @widgets_advanced));
 
-    my $buttons_pack = ($common->{ok} || !exists $common->{ok}) && $mainw->create_okcancel($common->{ok}, $common->{cancel}, '', if_($o->{interactive_help}, [ N("Help"), $o->{interactive_help}, 1 ]), if_(@$l2, $advanced_button));
+    my $buttons_pack = ($common->{ok} || !exists $common->{ok}) && $mainw->create_okcancel($common->{ok}, $common->{cancel}, '', if_($common->{interactive_help}, [ N("Help"), $common->{interactive_help}, 1 ]), if_(@$l2, $advanced_button));
 
     $pack->pack_start($always_pack, 1, 1, 0); $always_pack->show;
     $pack->pack_start($advanced_pack, 1, 1, 0);