Merge lp://qastaging/~jaytaoko/unity/unity-renamed-event-members into lp://qastaging/unity

Proposed by Jay Taoko
Status: Merged
Approved by: Jay Taoko
Approved revision: no longer in the source branch.
Merged at revision: 1818
Proposed branch: lp://qastaging/~jaytaoko/unity/unity-renamed-event-members
Merge into: lp://qastaging/unity
Diff against target: 103 lines (+13/-18)
2 files modified
plugins/unityshell/src/IMTextEntry.cpp (+6/-6)
plugins/unityshell/src/unity-util-accessible.cpp (+7/-12)
To merge this branch: bzr merge lp://qastaging/~jaytaoko/unity/unity-renamed-event-members
Reviewer Review Type Date Requested Status
Mirco Müller (community) Approve
Review via email: mp+87427@code.qastaging.launchpad.net

Description of the change

* Renamed Event class members in Nux
* Removed reference to NUX_STATE_META in unity-util-accessible.cpp. NUX_STATE_META wasn't generated by Nux.
* Removed reference to e_length in unity-util-accessible.cpp. No longer generated in Nux.

Depend on this Nux branch: https://code.launchpad.net/~jaytaoko/nux/nux-renamed-event-members/+merge/87426

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

Looks good to me.

Not setting the status to "Approved" yet, as lp:~jaytaoko/nux/nux-renamed-event-members needs to be merged first. Otherwise the auto-merger will throw up, if this is set to "Approved" right now.

review: Approve

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.