diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2016-03-21 16:23:58 +0100 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2016-03-21 21:47:46 +0100 |
| commit | a24768779fe1adfd53c0b1d9a8cacc3d9fefbb03 (patch) | |
| tree | 44cba25cc39dde63cb88ee0946e928aa8ceb008c | |
| parent | 79d02128ee01e8bc1a164027a17813b9dd2a6d20 (diff) | |
| download | drakx-a24768779fe1adfd53c0b1d9a8cacc3d9fefbb03.tar drakx-a24768779fe1adfd53c0b1d9a8cacc3d9fefbb03.tar.gz drakx-a24768779fe1adfd53c0b1d9a8cacc3d9fefbb03.tar.bz2 drakx-a24768779fe1adfd53c0b1d9a8cacc3d9fefbb03.tar.xz drakx-a24768779fe1adfd53c0b1d9a8cacc3d9fefbb03.zip | |
port from WebKit1 to WebKit2 (mga#15031)
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rwxr-xr-x | perl-install/standalone/display_help | 11 |
2 files changed, 7 insertions, 7 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index d33e5b92f..135d0d4b6 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- display_help: + o port from WebKit1 to WebKit2 (mga#15031) + Version 17.20 - 18 March 2016 - diskdrake: diff --git a/perl-install/standalone/display_help b/perl-install/standalone/display_help index 4e5866a10..332f36d91 100755 --- a/perl-install/standalone/display_help +++ b/perl-install/standalone/display_help @@ -23,16 +23,13 @@ use common; use any; use mygtk3 qw(gtknew); use ugtk3 qw(:wrappers :create); -use Gtk3::WebKit; +use Gtk3::WebKit2; -my $view = gtknew('WebKit_WebView', no_popup_menu => 1); +my $view = gtknew('WebKit2_WebView', no_popup_menu => 1); -my $websettings = $view->get_settings; -$websettings->set_property('allow-scripts-to-close-windows', 1); -$view->set_settings($websettings); -$view->signal_connect('close-web-view', sub { ugtk3::exit(0) }); +$view->signal_connect('close', sub { ugtk3::exit(0) }); -$view->open($ARGV[0]); +$view->load_uri($ARGV[0]); # FIXME: merge this with mcc code into new mygtk3::set_standalone_main_window_size()? my ($rootwin_width, $rootwin_height) = mygtk3::root_window_size(); |