- set_help is deprecated

- it is replaced by interactive_help_id on each ask_*
- many set_help do not have any correspondance in help.pm (drakxid-*),
  those are commented for now

1 files changed, 9 insertions, 0 deletions

diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm
index 53915ca61..f812ecba5 100644
--- a/perl-install/interactive.pm
+++ b/perl-install/interactive.pm
@@ -365,6 +365,7 @@ sub ask_from_normalize {
 	($common->{title} = $0) =~ s|.*/||;
     }
     $common->{interactive_help} ||= $o->{interactive_help};
+    $common->{interactive_help} ||= $common->{interactive_help_id} && sub { $o->interactive_help_get_id($common->{interactive_help_id}) };
     $common->{advanced_label} ||= N("Advanced");
     $common->{advanced_label_close} ||= N("Basic");
     $common->{$_} = [ deref($common->{$_}) ] foreach qw(messages advanced_messages);
@@ -394,6 +395,7 @@ sub ask_from_real {
 
 sub ask_browse_tree_info {
     my ($o, $title, $message, $common) = @_;
+    $common->{interactive_help} ||= $common->{interactive_help_id} && sub { $o->interactive_help_get_id($common->{interactive_help_id}) };
     add2hash_($common, { ok => N("Ok"), cancel => N("Cancel") });
     add2hash_($common, { title => $title, message => $message });
     add2hash_($common, { grep_allowed_to_toggle      => sub { @_ },
@@ -468,4 +470,11 @@ sub helper_separator_tree_to_tree {
 }
 
 
+sub interactive_help_get_id {
+    my @l = map { 
+	join("\n\n", map { s/\n/ /mg; $_ } split("\n\n", translate($help::steps{$_})))
+    } grep { exists $help::steps{$_} } @_;
+    join("\n\n\n", @l);
+}
+
 1;