Merge lp:~attente/unity-settings-daemon/1302353 into lp:unity-settings-daemon

Proposed by William Hua on 2014-04-04
Status: Merged
Approved by: Sebastien Bacher on 2014-04-07
Approved revision: 4037
Merged at revision: 4037
Proposed branch: lp:~attente/unity-settings-daemon/1302353
Merge into: lp:unity-settings-daemon
Diff against target: 14 lines (+0/-4)
1 file modified
plugins/keyboard/gsd-keyboard-manager.c (+0/-4)
To merge this branch: bzr merge lp:~attente/unity-settings-daemon/1302353
Reviewer Review Type Date Requested Status
Sebastien Bacher 2014-04-04 Approve on 2014-04-07
PS Jenkins bot (community) continuous-integration Approve on 2014-04-04
Review via email: mp+214357@code.launchpad.net

Commit message

Revert regression caused by commit 4033.

Description of the change

Revert regression caused by commit 4033.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/keyboard/gsd-keyboard-manager.c'
2--- plugins/keyboard/gsd-keyboard-manager.c 2014-04-04 01:32:34 +0000
3+++ plugins/keyboard/gsd-keyboard-manager.c 2014-04-04 23:32:05 +0000
4@@ -1136,10 +1136,6 @@
5 const gchar *ibus_layout;
6 ibus_layout = ibus_engine_desc_get_layout (engine_desc);
7
8- /* LP: #1298740 */
9- if (g_strcmp0 (ibus_layout, "default") == 0)
10- ibus_layout = "us";
11-
12 if (ibus_layout) {
13 layout = layout_from_ibus_layout (ibus_layout);
14 variant = variant_from_ibus_layout (ibus_layout);

Subscribers

People subscribed via source and target branches