Fix focus loss on tk unlock

[spinal84]

closes community-ssu/hildon-desktop#1

[pali]

I'm not sure if this fix is correct... Try to look at this commit: af059c4

[spinal84]

I found commit af059c4 using "git bisect" and that was starting point for my fix.
What exactly did you mean saying "try to look..."?

[spinal84]

Initial fix was like this: spinal84@f9baba1
The patch was simple, but resulting overall code became ugly.
So I tended to rewrite entire function to make it clean.