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

[William Hua]

Revert regression caused by commit 4033.

Revert regression caused by commit 4033.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4037
http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-ci/26/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-trusty-amd64-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-trusty-armhf-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-trusty-i386-ci/26

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

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

ok!

review: Approve

=== modified file 'plugins/keyboard/gsd-keyboard-manager.c'
--- plugins/keyboard/gsd-keyboard-manager.c	2014-04-04 01:32:34 +0000
+++ plugins/keyboard/gsd-keyboard-manager.c	2014-04-04 23:32:05 +0000
@@ -1136,10 +1136,6 @@
                         const gchar *ibus_layout;
                         ibus_layout = ibus_engine_desc_get_layout (engine_desc);
 
-                        /* LP: #1298740 */
-                        if (g_strcmp0 (ibus_layout, "default") == 0)
-                                ibus_layout = "us";
-
                         if (ibus_layout) {
                                 layout = layout_from_ibus_layout (ibus_layout);
                                 variant = variant_from_ibus_layout (ibus_layout);