Blame SOURCES/imsettings-rebase-gnome.patch

29947e
From af1791e51e3285dfa33c7d53a66254477dfc2355 Mon Sep 17 00:00:00 2001
29947e
From: Akira TAGOH <akira@tagoh.org>
29947e
Date: Thu, 7 Dec 2017 20:36:58 +0900
29947e
Subject: [PATCH 50/52] Fix to detect the latest GNOME
29947e
29947e
---
29947e
 data/imsettings-target-checker.sh.in | 5 ++++-
29947e
 1 file changed, 4 insertions(+), 1 deletion(-)
29947e
29947e
diff --git a/data/imsettings-target-checker.sh.in b/data/imsettings-target-checker.sh.in
29947e
index 07a207d..9f734f6 100755
29947e
--- a/data/imsettings-target-checker.sh.in
29947e
+++ b/data/imsettings-target-checker.sh.in
29947e
@@ -68,7 +68,7 @@ gsettings_get_bool() {
29947e
 	echo $exe get $schema $key
29947e
     fi
29947e
     ret=`$exe get $schema $key`
29947e
-    if [ $ret == "true" ]; then
29947e
+    if [ x$ret == "xtrue" ]; then
29947e
 	return 0
29947e
     else
29947e
 	return 1
29947e
@@ -82,6 +82,9 @@ case $(get_desktop|tr '[A-Z]' '[a-z]') in
29947e
 	    if gsettings_get_bool org.gnome.settings-daemon.plugins.keyboard active; then
29947e
 		log "org.gnome.settings-daemon.plugins.keyboard.active is true. imsettings is going to be disabled."
29947e
 		exit 0
29947e
+	    elif [ -f /etc/xdg/autostart/org.gnome.SettingsDaemon.Keyboard.desktop ]; then
29947e
+		log "org.gnome.SettingsDaemon.Keyboard.desktop exists. imsettings is going to be disabled."
29947e
+		exit 0
29947e
 	    else
29947e
 		exit 1
29947e
 	    fi
29947e
-- 
29947e
2.17.1
29947e