After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 683878 - keyboard: Don't touch the XKB layout with an empty input sources list
keyboard: Don't touch the XKB layout with an empty input sources list
Status: RESOLVED FIXED
Product: gnome-settings-daemon
Classification: Core
Component: general
unspecified
Other All
: Normal normal
: ---
Assigned To: gnome-settings-daemon-maint
gnome-settings-daemon-maint
Depends on:
Blocks:
 
 
Reported: 2012-09-12 15:25 UTC by Rui Matos
Modified: 2012-09-13 12:38 UTC
See Also:
GNOME target: ---
GNOME version: ---

Attachments
keyboard: Don't touch the XKB layout with an empty input sources list (3.72 KB, patch)
2012-09-12 15:25 UTC, Rui Matos 		accepted-commit_now Details | Review
keyboard: Don't touch the XKB layout with an empty input sources list (2.98 KB, patch)
2012-09-12 23:05 UTC, Rui Matos 		committed Details | Review
keyboard: Rename apply_xkb_layout() to make its purpose clearer (1.65 KB, patch)
2012-09-12 23:05 UTC, Rui Matos 		committed Details | Review

Description Rui Matos 2012-09-12 15:25:07 UTC 
Patch attached.
Comment 1 Rui Matos 2012-09-12 15:25:09 UTC 
Created attachment 224126 [details] [review]
keyboard: Don't touch the XKB layout with an empty input sources list

In case the user hasn't configured any input source it's less
surprising to default to the current X server's XKB layout and
variant.

This renames apply_xkb_layout() to apply_xkb_settings() to make it
clear that we also apply the options there. The options can't be
skipped if the setting is empty because then there would be no way for
users to get rid of them when disabling all of them in g-c-c.
Comment 2 Bastien Nocera 2012-09-12 15:32:48 UTC 
Review of attachment 224126 [details] [review]:

::: plugins/keyboard/gsd-keyboard-manager.c
@@ +690,2 @@
 static void
+apply_xkb_settings (GsdKeyboardManager *manager,

Can you make the rename in a separate commit if you need it?
Comment 3 Rui Matos 2012-09-12 23:05:05 UTC 
Created attachment 224162 [details] [review]
keyboard: Don't touch the XKB layout with an empty input sources list

In case the user hasn't configured any input source it's less
surprising to default to the current X server's XKB layout and
variant.
Comment 4 Rui Matos 2012-09-12 23:05:09 UTC 
Created attachment 224163 [details] [review]
keyboard: Rename apply_xkb_layout() to make its purpose clearer

This renames apply_xkb_layout() to apply_xkb_settings() to make it
clear that we also apply the options there. The options can't be
skipped if the setting is empty because then there would be no way for
users to get rid of them when disabling all of them in g-c-c.
Comment 5 Bastien Nocera 2012-09-12 23:08:17 UTC 
Review of attachment 224162 [details] [review]:

++
Comment 6 Bastien Nocera 2012-09-12 23:08:39 UTC 
Review of attachment 224163 [details] [review]:

++
Comment 7 Rui Matos 2012-09-13 12:38:06 UTC 
Attachment 224162 [details] pushed as e6b023d - keyboard: Don't touch the XKB layout with an empty input sources list
Attachment 224163 [details] pushed as 1a5db5e - keyboard: Rename apply_xkb_layout() to make its purpose clearer