From 196464c582b53e91678bfe2870a3e5c20c677e0d Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 20 Jun 2017 14:32:18 +0200 Subject: Fix at-spi-bus-launcher path in Fedora (ported and modifed from slick-greeter). --- src/arctica-greeter.vala | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/arctica-greeter.vala b/src/arctica-greeter.vala index a964588..9b5d279 100644 --- a/src/arctica-greeter.vala +++ b/src/arctica-greeter.vala @@ -576,15 +576,23 @@ public class ArcticaGreeter try { - string[] argv; - - Shell.parse_argv ("/usr/lib/at-spi2-core/at-spi-bus-launcher --launch-immediately", out argv); - Process.spawn_async (null, - argv, - null, - SpawnFlags.SEARCH_PATH, - null, - out atspi_pid); + string[] argv = null; + + if (FileUtils.test ("/usr/lib/at-spi2-core/at-spi-bus-launcher", FileTest.EXISTS)) { + // Debian & derivatives... + Shell.parse_argv ("/usr/lib/at-spi2-core/at-spi-bus-launcher --launch-immediately", out argv); + } + else if (FileUtils.test ("/usr/libexec/at-spi-bus-launcher", FileTest.EXISTS)) { + // Fedora & derivatives... + Shell.parse_argv ("/usr/libexec/at-spi-bus-launcher --launch-immediately", out argv); + } + if (argv != null) + Process.spawn_async (null, + argv, + null, + SpawnFlags.SEARCH_PATH, + null, + out atspi_pid); } catch (Error e) { -- cgit v1.2.3