Unity

Merge lp://qastaging/~unity-team/unity/unity.text-entry-im into lp://qastaging/unity

unity.text-entry-im
Merge into trunk

Proposed by Brandon Schaefer on 2012-02-23

Status:

Merged

Approved by:

Tim Penhey on 2012-02-23

Approved revision:

no longer in the source branch.

Merged at revision:

2011

Proposed branch:

lp://qastaging/~unity-team/unity/unity.text-entry-im

Merge into:

lp://qastaging/unity

Diff against target:

377 lines (+27/-251)

3 files modified

plugins/unityshell/src/DashController.cpp (+2/-0)
plugins/unityshell/src/IMTextEntry.cpp (+24/-221)
plugins/unityshell/src/IMTextEntry.h (+1/-30)

To merge this branch:

bzr merge lp://qastaging/~unity-team/unity/unity.text-entry-im

Related bugs:

Bug #880876: Unity causes ibus to not work correctly (spaces incorrectly placed)	High	Fix Released
Bug #926793: compiz crashed with SIGABRT in __gnu_cxx::__verbose_terminate_handler()	Critical	Fix Released

Link a bug report

Reviewer	Date Requested	Status
Marco Trevisan (Treviño)		Needs Fixing on 2012-02-23
Tim Penhey (community)		Approve on 2012-02-23
Jay Taoko (community)		Approve on 2012-02-23
Thomi Richards (community)	2012-02-23	Approve on 2012-02-23
Review via email: mp+94305@code.qastaging.launchpad.net

Commit message

IMTextEntry now only handles copy/cut and pasting, everything else is in nux::TextEntry

Revision history for this message

Thomi Richards (thomir-deactivatedaccount) wrote on 2012-02-23:

I've had a look through this, and it looks good to me.

review: Approve

Revision history for this message

Jay Taoko (jaytaoko) wrote on 2012-02-23:

Approved!

review: Approve

Revision history for this message

Unity Merger (unity-merger) wrote on 2012-02-23:

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

Revision history for this message

Brandon Schaefer (brandontschaefer) wrote on 2012-02-23:

-- checking for modules 'compiz;nux-2.0>=2.0.0;libbamf3;dee-1.0;gio-2.0;gio-unix-2.0;dbusmenu-glib-0.4;x11;libstartup-notification-1.0;gthread-2.0;indicator3-0.4;atk;unity-misc>=0.4.0;gconf-2.0;libutouch-geis;gtk+-3.0>=3.1;sigc++-2.0;json-glib-1.0;libnotify;gnome-desktop-3.0;gdu;ibus-1.0;unity>=4.99.0'
-- package 'ibus-1.0' not found