diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2017-01-12 16:38:15 +0100 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2017-01-12 16:40:09 +0100 |
| commit | 912abc9725196eded7554813e4d6adb91e66f169 (patch) | |
| tree | 7f288accf463d1869877dbc1bdc51fce01b57742 | |
| parent | 5872e3e29fa91ac318442d9d04c2d9b3eb4d144b (diff) | |
| download | drakx-912abc9725196eded7554813e4d6adb91e66f169.tar drakx-912abc9725196eded7554813e4d6adb91e66f169.tar.gz drakx-912abc9725196eded7554813e4d6adb91e66f169.tar.bz2 drakx-912abc9725196eded7554813e4d6adb91e66f169.tar.xz drakx-912abc9725196eded7554813e4d6adb91e66f169.zip | |
rely on Gtk+ for checking for Xserver (mga#19498)
MCC also needs a separate fix for forcing using the X11 GDK backend b/c
GtkPlug/Socket do not work under Wayland, thus relying on xwayland
XFdrake will probably fails the same way under wayland, but anyway it's
there for configuring xserver...
It should probably checks for wayland before proposing to test
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/common.pm | 5 |
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; |