Accepting request 792827 from home:xiaoguang_wang:branches:GNOME:Factory

- Update gnome-shell-disable-ibus-when-not-installed.patch: Remove
  error in journal log(bsc#1169029).

OBS-URL: https://build.opensuse.org/request/show/792827
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=422
This commit is contained in:
Dominique Leuenberger 2020-04-15 18:17:15 +00:00 committed by Git OBS Bridge
parent 57672c62a2
commit 25f89e6316
2 changed files with 24 additions and 7 deletions

View File

@ -1,14 +1,14 @@
From d8109a8e9db11cc7374faba3264b9f00dc5e1699 Mon Sep 17 00:00:00 2001
From: Chingkai <qkzhu@suse.com>
Date: Wed, 13 Mar 2019 14:50:22 +0800
From 29dfda2d2f77d14e27cc27cbba1e41ec0363cf83 Mon Sep 17 00:00:00 2001
From: Xiaoguang Wang <xwang@suse.com>
Date: Thu, 9 Apr 2020 11:16:56 +0800
Subject: [PATCH] Disable ibus when out of CJK
---
js/misc/ibusManager.js | 4 ++++
1 file changed, 4 insertions(+)
js/misc/ibusManager.js | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/js/misc/ibusManager.js b/js/misc/ibusManager.js
index d20ad2f..0595573 100644
index e43f88c..9d16f09 100644
--- a/js/misc/ibusManager.js
+++ b/js/misc/ibusManager.js
@@ -31,6 +31,10 @@ function getIBusManager() {
@ -22,6 +22,17 @@ index d20ad2f..0595573 100644
IBus.init();
// This is the longest we'll keep the keyboard frozen until an input
@@ -59,6 +63,10 @@ var IBusManager = class {
}
_spawn(extraArgs = []) {
+ let daemon = Gio.File.new_for_path('/usr/bin/ibus-daemon');
+ if (!daemon.query_exists(null))
+ return;
+
try {
let cmdLine = ['ibus-daemon', '--panel', 'disable', ...extraArgs];
Gio.Subprocess.new(cmdLine, Gio.SubprocessFlags.NONE);
--
2.16.4
2.26.0

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Apr 9 06:32:48 UTC 2020 - Xiaoguang Wang <xiaoguang.wang@suse.com>
- Update gnome-shell-disable-ibus-when-not-installed.patch: Remove
error in journal log(bsc#1169029).
-------------------------------------------------------------------
Wed Apr 01 11:06:59 UTC 2020 - bjorn.lie@gmail.com