From 80342270e0264cc119d203b8183c707ecbed5e9e700d9b6d3d8c2338d28367ab Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Fri, 22 Aug 2014 16:42:57 +0000 Subject: [PATCH] Accepting request 245782 from home:fcrozat:branches:M17N - Update ibus xim script to properly detect GNOME 3.12+ and to use ibus default configuration on first startup of GNOME (bnc#862589 internal), with help from Takashi Iwai. OBS-URL: https://build.opensuse.org/request/show/245782 OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=121 --- ibus.changes | 7 +++++++ xim.d-ibus-121 | 14 +++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/ibus.changes b/ibus.changes index b608506..bfcc8dd 100644 --- a/ibus.changes +++ b/ibus.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Aug 22 12:49:54 UTC 2014 - fcrozat@suse.com + +- Update ibus xim script to properly detect GNOME 3.12+ and to use + ibus default configuration on first startup of GNOME (bnc#862589 + internal), with help from Takashi Iwai. + ------------------------------------------------------------------- Mon Aug 11 15:03:41 CEST 2014 - fcrozat@suse.com diff --git a/xim.d-ibus-121 b/xim.d-ibus-121 index 7da256e..c3beea1 100644 --- a/xim.d-ibus-121 +++ b/xim.d-ibus-121 @@ -31,7 +31,19 @@ __END # GNOME 3 Settings Daemon keyboard plugin manages all ibus settings itself, # so don't do manual setup&startup of ibus otherwise it would conflict with # G-S-D. see bnc#873016. - *gnome-session*) + *gnome*) + SOURCES=$(gsettings get org.freedesktop.ibus.general preload-engines) + if [ "$SOURCES" == '@as []' ]; then + echo "initial GNOME startup, ibus default configuration applied" + ibus-daemon -d + timer=5 + while [ "$SOURCES" == '@as []' ] && [ ${timer} -gt 0 ]; do + sleep 1 + timer=$[${timer}-1] + SOURCES=$(gsettings get org.freedesktop.ibus.general preload-engines) + done + ibus exit + fi # make sure G-S-D keyboard plugin is active echo "ibus will be managed by GNOME." gsettings set org.gnome.settings-daemon.plugins.keyboard active true