summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-09-30 04:06:24 +0000
committerThierry Vignaud <tv@mandriva.org>2008-09-30 04:06:24 +0000
commit52d23f43f57b0c0fcf3147ff2542663575b309f5 (patch)
tree83f535a73e8bd8d65bc9dca5d97a8ccedbc27b66
parent52c4b1a37afabec90bd74cfd2a83b9cbf7539502 (diff)
downloaddrakx-52d23f43f57b0c0fcf3147ff2542663575b309f5.tar
drakx-52d23f43f57b0c0fcf3147ff2542663575b309f5.tar.gz
drakx-52d23f43f57b0c0fcf3147ff2542663575b309f5.tar.bz2
drakx-52d23f43f57b0c0fcf3147ff2542663575b309f5.tar.xz
drakx-52d23f43f57b0c0fcf3147ff2542663575b309f5.zip
(get_html_file,display_help) add basic support for anchors
-rw-r--r--perl-install/interactive/gtk.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm
index be2946090..f04c04e32 100644
--- a/perl-install/interactive/gtk.pm
+++ b/perl-install/interactive/gtk.pm
@@ -773,6 +773,8 @@ sub load_from_uri {
sub get_html_file {
my ($o, $url) = @_;
+ $url =~ s/#.*//;
+ $url .= '.html' if $url !~ /\.html$/;
find { -e $_ } map { "$help_path/${_}" }
map {
my $id = $_;
@@ -787,7 +789,7 @@ sub display_help {
require Gtk2::WebKit;
my $view = gtknew('WebKit_View');
- load_from_uri($view, "$file.html");
+ load_from_uri($view, $file);
my $w = ugtk2->new(N("Help"), transient => $mainw->{real_window}, modal => 1);
gtkadd($w->{rwindow},