diff -Nru unity-settings-daemon-14.04.0+14.04.20140404/debian/changelog unity-settings-daemon-14.04.0+14.04.20140407/debian/changelog --- unity-settings-daemon-14.04.0+14.04.20140404/debian/changelog 2014-04-07 15:12:17.000000000 +0000 +++ unity-settings-daemon-14.04.0+14.04.20140407/debian/changelog 2014-04-07 15:12:17.000000000 +0000 @@ -1,3 +1,10 @@ +unity-settings-daemon (14.04.0+14.04.20140407-0ubuntu1) trusty; urgency=low + + [ William Hua ] + * Revert regression caused by commit 4033. (LP: #1302353) + + -- Ubuntu daily release Mon, 07 Apr 2014 14:55:36 +0000 + unity-settings-daemon (14.04.0+14.04.20140404-0ubuntu1) trusty; urgency=low [ William Hua ] diff -Nru unity-settings-daemon-14.04.0+14.04.20140404/plugins/keyboard/gsd-keyboard-manager.c unity-settings-daemon-14.04.0+14.04.20140407/plugins/keyboard/gsd-keyboard-manager.c --- unity-settings-daemon-14.04.0+14.04.20140404/plugins/keyboard/gsd-keyboard-manager.c 2014-04-04 16:20:16.000000000 +0000 +++ unity-settings-daemon-14.04.0+14.04.20140407/plugins/keyboard/gsd-keyboard-manager.c 2014-04-07 14:55:26.000000000 +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);