Accepting request 233835 from home:cxiong:branches:M17N
- Let GNOME 3 handles ibus startup&setup. (bnc#873016) * Changed xim.d-ibus-121. * Reformatting the latter part of the xim.d-ibus-121. OBS-URL: https://build.opensuse.org/request/show/233835 OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=101
This commit is contained in:
parent
6a2b7475c3
commit
4dd6f8a467
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed May 14 08:04:18 UTC 2014 - cxiong@suse.com
|
||||||
|
|
||||||
|
- Let GNOME 3 handles ibus startup&setup. (bnc#873016)
|
||||||
|
* Changed xim.d-ibus-121.
|
||||||
|
* Reformatting the latter part of the xim.d-ibus-121.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Mar 17 15:37:25 UTC 2014 - ftake@geeko.jp
|
Mon Mar 17 15:37:25 UTC 2014 - ftake@geeko.jp
|
||||||
|
|
||||||
|
@ -7,9 +7,9 @@ if ! type -p ibus-daemon > /dev/null 2>&1 ; then
|
|||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
case "$WINDOWMANAGER" in
|
||||||
#when skim installed, Autostart must be "false".
|
#when skim installed, Autostart must be "false".
|
||||||
#here we move $HOME/.kde/share/config/skimrc to skimrc.orig.ibus
|
#here we move $HOME/.kde/share/config/skimrc to skimrc.orig.ibus
|
||||||
case "$WINDOWMANAGER" in
|
|
||||||
*kde*)
|
*kde*)
|
||||||
if type -p skim > /dev/null 2>&1 \
|
if type -p skim > /dev/null 2>&1 \
|
||||||
&& ! grep -i -q "^[[:space:]]*Autostart.*=.*false" $HOME/.kde/share/config/skimrc
|
&& ! grep -i -q "^[[:space:]]*Autostart.*=.*false" $HOME/.kde/share/config/skimrc
|
||||||
@ -28,6 +28,16 @@ __END
|
|||||||
:
|
:
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
# 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*)
|
||||||
|
# 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
|
||||||
|
PATH=$OLD_PATH
|
||||||
|
return 0
|
||||||
|
;;
|
||||||
*)
|
*)
|
||||||
# do nothing
|
# do nothing
|
||||||
;;
|
;;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user