Comment 18 for bug 601816

I did not get ibus to do anything yet, but I did make the preedit thing show up :-) So with my changes it didn't correctly collapse with the previous patch, so new one updated attached (one line difference)