ubuntu-keyboard

Merge lp://staging/~thomas-moenicke/ubuntu-keyboard/ubuntu-keyboard-language-menu-3 into lp://staging/ubuntu-keyboard

  1. ubuntu-keyboard-language-menu-3
  2. Merge into trunk
Proposed by Thomas Moenicke
Status: Rejected
Rejected by: Günter Schwann
Proposed branch: lp://staging/~thomas-moenicke/ubuntu-keyboard/ubuntu-keyboard-language-menu-3
Merge into: lp://staging/ubuntu-keyboard
Diff against target: 61 lines (+19/-4) (has conflicts)
3 files modified
qml/KeyboardContainer.qml (+7/-0)
src/plugin/inputmethod.cpp (+12/-0)
src/plugin/inputmethod_p.h (+0/-4)
Text conflict in qml/KeyboardContainer.qml
Text conflict in src/plugin/inputmethod.cpp
To merge this branch: bzr merge lp://staging/~thomas-moenicke/ubuntu-keyboard/ubuntu-keyboard-language-menu-3
Reviewer Review Type Date Requested Status
Günter Schwann (community) Disapprove
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+192691@code.staging.launchpad.net

Commit message

legacy code gets original id from maliit-server, so it loads xml files that exist (fails to start osk otherwise)
fixed typo in English that prevented loading of regular layout after url layout

Description of the change

legacy code gets original id from maliit-server, so it loads xml files that exist (fails to start osk otherwise)
fixed typo in English that prevented loading of regular layout after url layout

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:98
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/192/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/20/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-keyboard-ci/192/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Günter Schwann (schwann) wrote :

will in another MR

review: Disapprove

Unmerged revisions

98. By Thomas Moenicke

legacy code gets original id from maliit-server, so it loads xml files that exist (fails to start osk otherwise)
fixed typo in English that prevented loading of regular layout after url layout

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.

Subscribers

People subscribed via source and target branches