diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-06-20 14:32:18 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-06-20 14:45:48 +0200 |
| commit | 196464c582b53e91678bfe2870a3e5c20c677e0d (patch) | |
| tree | bb9443eb57c16f69f2e07a1c3a20386acccf7567 | |
| parent | 70a6deb13b646d2ed263d5f10abad48cdab5cebc (diff) | |
| download | arctica-greeter-196464c582b53e91678bfe2870a3e5c20c677e0d.tar.gz arctica-greeter-196464c582b53e91678bfe2870a3e5c20c677e0d.tar.bz2 arctica-greeter-196464c582b53e91678bfe2870a3e5c20c677e0d.zip | |
Fix at-spi-bus-launcher path in Fedora (ported and modifed from slick-greeter).
| -rw-r--r-- | src/arctica-greeter.vala | 26 |
1 files changed, 17 insertions, 9 deletions
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) { |