summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/common.pm5
2 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 6637bf7fb..ffd281e5e 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -3,6 +3,8 @@
- diskdrake:
o fix exception when clearing all partitions on !UEFI (mga#20083)
- recognize new kernel-4.9 drivers
+- rely on Gtk+ for checking if we can connect to Xserver (mga#19498)
+ (meaning relying on xwayland under Wayland)
Version 17.65 - 12 December 2016
diff --git a/perl-install/common.pm b/perl-install/common.pm
index ddffb53f4..83ce5f928 100644
--- a/perl-install/common.pm
+++ b/perl-install/common.pm
@@ -608,8 +608,9 @@ sub check_for_xserver() {
if (!defined $::xtest) {
$::xtest = 0;
eval {
- require xf86misc::main;
- $::xtest = xf86misc::main::Xtest($ENV{DISPLAY});
+ require Gtk3;
+ Gtk3->import;
+ $::xtest = Gtk3::init_check();
} if $ENV{DISPLAY};
}
return $::xtest;