Unity Settings Daemon

Merge lp://staging/~attente/unity-settings-daemon/fcitx-transition into lp://staging/unity-settings-daemon

fcitx-transition
Merge into trunk

Proposed by William Hua on 2014-08-11

Status:

Merged

Approved by:

Sebastien Bacher on 2015-03-10

Approved revision:

4064

Merged at revision:

4069

Proposed branch:

lp://staging/~attente/unity-settings-daemon/fcitx-transition

Merge into:

lp://staging/unity-settings-daemon

Diff against target:

1362 lines (+998/-66)

8 files modified

.bzrignore (+1/-0)
configure.ac (+22/-2)
debian/control (+4/-1)
debian/rules (+1/-1)
plugins/keyboard/Makefile.am (+7/-0)
plugins/keyboard/gsd-keyboard-manager.c (+633/-50)
plugins/keyboard/input-method-engines.gperf (+203/-0)
plugins/media-keys/gsd-media-keys-manager.c (+127/-12)

To merge this branch:

bzr merge lp://staging/~attente/unity-settings-daemon/fcitx-transition

Undecided

New

Link a bug report

Reviewer	Review Type	Date Requested	Status
Sebastien Bacher		2014-08-11	Approve on 2015-03-10
PS Jenkins bot (community)	continuous-integration		Approve on 2015-02-12
Review via email: mp+230289@code.staging.launchpad.net

Commit message

Basic Fcitx support.

Description of the change

Basic Fcitx support.

Revision history for this message

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

PASSED: Continuous integration, rev:4048
http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-ci/34/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-armhf-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-i386-ci/8

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-settings-daemon-ci/34/rebuild

review: Approve (continuous-integration)

lp://staging/~attente/unity-settings-daemon/fcitx-transition updated on 2014-08-14

4049. By William Hua on 2014-08-14: Revert.
4050. By William Hua on 2014-08-14: Use fcitx-gclient API instead.

Revision history for this message

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

PASSED: Continuous integration, rev:4050
http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-ci/35/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-armhf-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-i386-ci/9

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-settings-daemon-ci/35/rebuild

review: Approve (continuous-integration)

Revision history for this message

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

Thanks, looks mostly fine, some comments:

- we shouldn't recommend both ibus and fcitx from the settings daemon, we should rather seed fcitx if we want it installed by default

- we need to have the fcitx MIR approved because we can land the changes, since it adds a build-depends on packages which are currently in universe

- looks fine to land otherwise

setting needs fixing for the recommend, then it's good to go, once the fcitx MIR is ready

review: Needs Fixing

lp://staging/~attente/unity-settings-daemon/fcitx-transition updated on 2014-08-15

4051. By William Hua on 2014-08-15: Remove fcitx from recommends.

Revision history for this message

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

PASSED: Continuous integration, rev:4051
http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-ci/36/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-armhf-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-i386-ci/10

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-settings-daemon-ci/36/rebuild

review: Approve (continuous-integration)

lp://staging/~attente/unity-settings-daemon/fcitx-transition updated on 2014-08-18

4052. By William Hua on 2014-08-18: Sync Fcitx engine list to input sources.

Revision history for this message

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

PASSED: Continuous integration, rev:4052
http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-ci/37/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-armhf-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-i386-ci/11

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-settings-daemon-ci/37/rebuild

review: Approve (continuous-integration)

lp://staging/~attente/unity-settings-daemon/fcitx-transition updated on 2014-08-18

4053. By William Hua on 2014-08-18: Activate Fcitx when disabled.

Revision history for this message

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

PASSED: Continuous integration, rev:4053
http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-ci/38/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-armhf-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-i386-ci/12

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-settings-daemon-ci/38/rebuild

review: Approve (continuous-integration)

lp://staging/~attente/unity-settings-daemon/fcitx-transition updated on 2014-08-27

4054. By William Hua on 2014-08-27: Translate keyboard layout names properly to Fcitx.

Revision history for this message

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

PASSED: Continuous integration, rev:4054
http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-ci/39/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-armhf-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-i386-ci/13

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-settings-daemon-ci/39/rebuild

review: Approve (continuous-integration)

lp://staging/~attente/unity-settings-daemon/fcitx-transition updated on 2014-08-28

4055. By William Hua on 2014-08-28: Update current index when Fcitx engine changes.

Revision history for this message

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

PASSED: Continuous integration, rev:4055
http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-ci/40/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-armhf-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-i386-ci/14

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-settings-daemon-ci/40/rebuild

review: Approve (continuous-integration)

lp://staging/~attente/unity-settings-daemon/fcitx-transition updated on 2014-09-02

4056. By William Hua on 2014-09-02: Sync fcitx engines to dconf.

Revision history for this message

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

PASSED: Continuous integration, rev:4056
http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-ci/45/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-amd64-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-armhf-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-i386-ci/19

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-settings-daemon-ci/45/rebuild

review: Approve (continuous-integration)

lp://staging/~attente/unity-settings-daemon/fcitx-transition updated on 2014-09-03

4057. By William Hua on 2014-09-03: Fix migration; WIP: finish get_fcitx_engine_for_ibus_engine ().

Revision history for this message

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

PASSED: Continuous integration, rev:4057
http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-ci/46/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-armhf-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-i386-ci/20

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-settings-daemon-ci/46/rebuild

review: Approve (continuous-integration)

lp://staging/~attente/unity-settings-daemon/fcitx-transition updated on 2014-09-04

4058. By William Hua on 2014-09-04: Finish get_fcitx_engine_for_ibus_engine ().

Revision history for this message

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

FAILED: Continuous integration, rev:4058
http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-ci/47/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-amd64-ci/21/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-armhf-ci/21/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-i386-ci/21/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-settings-daemon-ci/47/rebuild

review: Needs Fixing (continuous-integration)

lp://staging/~attente/unity-settings-daemon/fcitx-transition updated on 2014-09-04

4059. By William Hua on 2014-09-04: Add gperf as build dependency.

Revision history for this message

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

PASSED: Continuous integration, rev:4059
http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-ci/48/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-armhf-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-i386-ci/22

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-settings-daemon-ci/48/rebuild

review: Approve (continuous-integration)

lp://staging/~attente/unity-settings-daemon/fcitx-transition updated on 2014-09-10

4060. By William Hua on 2014-09-09: Set initial IM when Fcitx appears.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-10:

PASSED: Continuous integration, rev:4060
http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-ci/49/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-armhf-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-i386-ci/23

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-settings-daemon-ci/49/rebuild

review: Approve (continuous-integration)

lp://staging/~attente/unity-settings-daemon/fcitx-transition updated on 2014-09-18

4061. By William Hua on 2014-09-11: Use Fcitx current IM instead of current source when available.
4062. By William Hua on 2014-09-17: Migrate per-window setting to Fcitx.
4063. By William Hua on 2014-09-18: Remember to zero struct.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-18:

PASSED: Continuous integration, rev:4063
http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-ci/50/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-amd64-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-armhf-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-i386-ci/24

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-settings-daemon-ci/50/rebuild

review: Approve (continuous-integration)

lp://staging/~attente/unity-settings-daemon/fcitx-transition updated on 2015-02-12

4064. By William Hua on 2015-02-12: Merge trunk.

Revision history for this message

William Hua (attente) wrote on 2015-02-12:

Hi, could we please reconsider this for approval now that Fcitx is approved for main? I don't remember why I added fcitx-data as a Recommends, but if it's wrong, I'll remove it.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-02-12:

PASSED: Continuous integration, rev:4064
http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-ci/57/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-vivid-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-vivid-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-vivid-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-settings-daemon-ci/57/rebuild

review: Approve (continuous-integration)

Revision history for this message

Sebastien Bacher (seb128) wrote on 2015-03-10:

Thanks, seems like we don't have anyone available to do a detailed review, so based on a read of the changes and testing in a ppa let's approve that, if there are issues we can sort them out with another landing

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.

Subscribers

People subscribed via source and target branches

to all changes:

Unity Settings Daemon Development Team

William Hua