From dd184c7d5b7e8380b7fdc951ba5209ea96f1ed47 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Mon, 21 Mar 2016 08:25:49 +0100
Subject: use WebKit2 instead of WebKit1

---
 perl-install/any.pm             | 6 +++---
 perl-install/install/NEWS       | 1 +
 perl-install/interactive/gtk.pm | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/perl-install/any.pm b/perl-install/any.pm
index 4107edded..d5e2ded6b 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -1021,13 +1021,13 @@ sub display_release_notes {
         return;
     }
 
-    require Gtk3::WebKit;
+    require Gtk3::WebKit2;
     require ugtk3;
     ugtk3->import(':all');
     require mygtk3;
     mygtk3->import('gtknew');
-    my $view = gtknew('WebKit_WebView', no_popup_menu => 1);
-    $view->load_html_string($release_notes, '/');
+    my $view = gtknew('WebKit2_WebView', no_popup_menu => 1);
+    $view->load_html($release_notes, '/');
                                
     my $w = ugtk3->new(N("Release Notes"), transient => $::main_window, modal => 1, pop_it => 1);
     gtkadd($w->{rwindow},
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 6ec65d657..6bf598aa7 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,6 @@
 - load evdev (thus fixing a crash)
 - load psmouse (it is now modular)
+- use WebKit2 instead of WebKit1 for displaying help content
 
 Version 17.20 - 18 March 2016
 
diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm
index dad4375d5..161aaa574 100644
--- a/perl-install/interactive/gtk.pm
+++ b/perl-install/interactive/gtk.pm
@@ -783,7 +783,7 @@ sub is_help_file_exist {
 
 sub load_from_uri {
     my ($view, $url) = @_;
-    $view->open(get_html_file($::o, $url));
+    $view->load_uri(get_html_file($::o, $url), 'file:///');
 }
 
 sub get_html_file {
@@ -804,8 +804,8 @@ sub get_html_file {
 sub display_help_window {
     my ($o, $common) = @_;
     if (my $file = $common->{interactive_help_id}) {
-        require Gtk3::WebKit;
-        my $view = gtknew('WebKit_WebView');
+        require Gtk3::WebKit2;
+        my $view = gtknew('WebKit2_WebView');
 
         load_from_uri($view, $file);
 
-- 
cgit v1.2.1