From 2e7b47c984f7f7d96604e1d4badbe29b74ccca8f Mon Sep 17 00:00:00 2001 From: Radoslaw Cybulski Date: Mon, 4 Mar 2019 13:09:32 +0100 Subject: [PATCH] Fix for invalid at-spi configuration Fixes not working configuration (dbus-daemon binary not found), which caused at-spi2-bus-launcher not to start. Fixes crash due to missing schema for GSetting. Change-Id: I5f1692144b4c7487f33739832780224707be001c --- bus/at-spi-bus-launcher.c | 6 ++++-- packaging/at-spi2-core.spec | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bus/at-spi-bus-launcher.c b/bus/at-spi-bus-launcher.c index f8ae02b..e42a26d 100644 --- a/bus/at-spi-bus-launcher.c +++ b/bus/at-spi-bus-launcher.c @@ -1,6 +1,6 @@ /* -*- mode: c; c-basic-offset: 2; indent-tabs-mode: nil; -*- - * - * at-spi-bus-launcher: Manage the a11y bus as a child process + * + * at-spi-bus-launcher: Manage the a11y bus as a child process * * Copyright 2011-2018 Red Hat, Inc. * @@ -929,6 +929,8 @@ get_schema (const gchar *name) { #if GLIB_CHECK_VERSION (2, 32, 0) GSettingsSchemaSource *source = g_settings_schema_source_get_default (); + if (!source) return NULL; + GSettingsSchema *schema = g_settings_schema_source_lookup (source, name, FALSE); if (schema == NULL) diff --git a/packaging/at-spi2-core.spec b/packaging/at-spi2-core.spec index b4ac7f0..7981bc8 100644 --- a/packaging/at-spi2-core.spec +++ b/packaging/at-spi2-core.spec @@ -73,7 +73,7 @@ to develop applications that require these. cp %{SOURCE1001} . %build -meson --prefix /usr/ build -Dwith-dbus-daemondir=%{_bindir} \ +meson --prefix /usr/ build -Dwith-dbus-daemondir=%{_bindir} -Ddbus_daemon=/usr/bin/dbus-daemon \ %if !%{with x} -Denable-x11=no \ %else -- 2.7.4