Unity

Merge lp://qastaging/~unity-team/unity/unity.composition-char into lp://qastaging/unity

  1. unity.composition-char
  2. Merge into trunk
Proposed by Jay Taoko
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: no longer in the source branch.
Merged at revision: 2054
Proposed branch: lp://qastaging/~unity-team/unity/unity.composition-char
Merge into: lp://qastaging/unity
Diff against target: 188 lines (+120/-8)
4 files modified
plugins/unityshell/src/IMTextEntry.cpp (+77/-8)
plugins/unityshell/src/IMTextEntry.h (+12/-0)
tests/autopilot/autopilot/emulators/X11.py (+1/-0)
tests/autopilot/autopilot/tests/test_dash.py (+30/-0)
To merge this branch: bzr merge lp://qastaging/~unity-team/unity/unity.composition-char
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) Needs Fixing
Neil J. Patel (community) Approve
Mirco Müller (community) Needs Fixing
Review via email: mp+95653@code.qastaging.launchpad.net

Description of the change

UNBLOCK

* Use Gtk im for composition characters.

Fix bug #944674

To post a comment you must log in.
Revision history for this message
Mirco Müller (macslow) wrote :

In IMTextEntry::CheckValidClientWindow() you do...

76 + if (1/*focused_*/)
77 + {
78 + gtk_im_context_focus_in(im_context_);
79 + }

... please don't. Either use a proper conditional statement that can change at runtime or just drop completely.

In IMTextEntry::TryHandleEvent() you don't initialize ev...

89 + CheckValidClientWindow(event.x11_window);
90 +
91 + GdkEventKey ev;
92 + KeyEventToGdkEventKey(event, ev);

... and that's asking for trouble. Maybe not in that particular case (about to be filled by the next call). Just bzero() it. Always be explicit!

review: Needs Fixing
Revision history for this message
Jay Taoko (jaytaoko) wrote :

* ev is filled by the call to KeyEventToGdkEventKey. I think there is no need to bzero it.

Revision history for this message
Neil J. Patel (njpatel) wrote :

Code looks good, passes tests, excellent work!

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/385/console reported an error when processing this lp:~unity-team/unity/unity.composition-char branch.
Not merging it.

Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

This breaks IBus support as well as any shortcut that uses the ctrl key, ie ctrl + a/x/c/v...

review: Needs Fixing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.