Indicator keyboard

Merge lp://staging/~attente/indicator-keyboard/1291962-2 into lp://staging/indicator-keyboard

1291962-2
Merge into trunk

Proposed by William Hua on 2014-03-28

Status:

Merged

Merged at revision:

337

Proposed branch:

lp://staging/~attente/indicator-keyboard/1291962-2

Merge into:

lp://staging/indicator-keyboard

Diff against target:

591 lines (+205/-127)

9 files modified

.bzrignore (+3/-1)
data/Makefile.am (+2/-2)
lib/Makefile.am (+7/-6)
lib/ibus-menu.vala (+22/-23)
lib/indicator-menu.vala (+128/-0)
lib/main.vala (+36/-90)
po/POTFILES.in (+1/-0)
po/POTFILES.skip (+1/-0)
po/indicator-keyboard.pot (+5/-5)

To merge this branch:

bzr merge lp://staging/~attente/indicator-keyboard/1291962-2

Related bugs:

Bug #1291962: lock screen allows interaction with keyboard settings

High

Fix Released

Remove

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2014-04-08
Sebastien Bacher			Needs Fixing on 2014-04-08
Ted Gould (community)		2014-03-28	Approve on 2014-04-02
Review via email: mp+213346@code.staging.launchpad.net

Commit message

Export separate menus for desktop and greeter.

Description of the change

Export separate menus for desktop and greeter.

(Re-submission of https://code.launchpad.net/~attente/indicator-keyboard/1291962/+merge/212967)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-28:

#

PASSED: Continuous integration, rev:321
http://jenkins.qa.ubuntu.com/job/indicator-keyboard-ci/55/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-trusty-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-trusty-armhf-ci/22
        deb: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-trusty-armhf-ci/22/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-keyboard-ci/55/rebuild

review: Approve (continuous-integration)

Revision history for this message

Ted Gould (ted) wrote on 2014-04-02:

#

Small thing, need to change the "..." to a "…" in "Text Entry Settings..." Marking approved on the review but not top-approving.

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-02:

#

PASSED: Continuous integration, rev:322
http://jenkins.qa.ubuntu.com/job/indicator-keyboard-ci/60/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-trusty-amd64-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-trusty-armhf-ci/27
        deb: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-trusty-armhf-ci/27/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-keyboard-ci/60/rebuild

review: Approve (continuous-integration)

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-04-03:

#

While Ted's comment makes sense, could you revert it? That's a string change which would invalidate the translations, the i18n team said that would be better be done next cycle to avoid regression on some locales for the release.

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-03:

#

PASSED: Continuous integration, rev:323
http://jenkins.qa.ubuntu.com/job/indicator-keyboard-ci/61/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-trusty-amd64-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-trusty-armhf-ci/28
        deb: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-trusty-armhf-ci/28/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-keyboard-ci/61/rebuild

review: Approve (continuous-integration)

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-04-08:

#

trying to put that under CI train the build failed with

" VALAC indicator_keyboard_service_vala.stamp
main.vala:134.9-134.20: error: The name `sources_menu' does not exist in the context of `Indicator.Keyboard.Service.get_ibus._lambda12_'
    if (sources_menu != null) {
        ^^^^^^^^^^^^
main.vala:135.6-135.24: error: The name `update_sources_menu' does not exist in the context of `Indicator.Keyboard.Service.get_ibus._lambda12_'
     update_sources_menu ();"

review: Needs Fixing

lp://staging/~attente/indicator-keyboard/1291962-2 updated on 2014-04-08

324. By William Hua on 2014-04-08: Merge trunk fixing conflicts.

Revision history for this message

William Hua (attente) wrote on 2014-04-08:

#

Sorry... it's the same bad merge.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-08:

#

PASSED: Continuous integration, rev:324
http://jenkins.qa.ubuntu.com/job/indicator-keyboard-ci/64/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-trusty-amd64-ci/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-trusty-armhf-ci/31
        deb: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-trusty-armhf-ci/31/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-keyboard-ci/64/rebuild

review: Approve (continuous-integration)

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

to all changes:

William Hua