Bug 57876

Description of Problem:

1. In the script /etc/X11/xinit/xinitrc.d/xinput, there is a shell variable
XIM.  If this variable is unset in the script's environment (which is
normally the case) then it is set to either some CJK language thing, or to
"none" otherwise.  In no case is it left empty.

However, later in the script (line 177), there is a check to see whether
XIM is non-empty, and if so the XMODIFIERS environment variable is
exported.  This means that XMODIFIERS is always exported even though it is
needed only for CJK language stuff, and the value exported is bogus.


2. At the end of /etc/X11/xinit/xinitrc.d/xinput, there is an extraneous
debugging echo statement left in.  This ends up in the user's
.xsession-errors file.  The debugging statement doesn't echo a newline, so
it messes up subsequent errors in ~/.xsession-errors.


A simple patch which fixes both of these is attached separately.


Version-Release number of selected component (if applicable):

xinitrc-3.20-1


How Reproducible:

Always reproducible.


Steps to Reproduce:
1. Log into KDE (probably Gnome as well, I haven't checked)
2. Examine XMODIFIERS environment variable in a shell, it contains a bogus
value.
3. Examine ~/.xsession-errors.  It contains a bogus debugging line.

Actual Results:


Expected Results:


Additional Information: