applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't depend on /desktop/gnome/accessibility/keyboard/enable for setting

Browse source 
2008-01-05  Denis Washington  <denisw@svn.gnome.org>

	* gnome-settings-daemon/gnome-settings-accessibility-keyboard.c: 
	Don't depend on /desktop/gnome/accessibility/keyboard/enable for 
	setting the AccessXFeedback flag; instead, set it if one of the
	notification bits is enabled.

svn path=/trunk/; revision=8371
This commit is contained in:
Denis Washington 2008-01-05 18:49:07 +00:00 • committed by Denis Washington
parent 263cbee55f
commit 954f6f8f8b
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gnome-settings-daemon/ChangeLog
View file

@ -1,3 +1,10 @@
2008-01-05 Denis Washington <denisw@svn.gnome.org>
* gnome-settings-accessibility-keyboard.c: Don't depend on
/desktop/gnome/accessibility/keyboard/enable for setting
the AccessXFeedback flag; instead, set it if one of the
notification bits is enabled.
2008-01-02 Denis Washington <denisw@svn.gnome.org>
* gnome-settings-accessibility-keyboard.c: Only consider

18
gnome-settings-daemon/gnome-settings-accessibility-keyboard.c
View file

@ -236,7 +236,7 @@ set_server_from_gconf (GConfEntry *ignored)
desc->ctrls->enabled_ctrls = set_clear (enable_accessX,
desc->ctrls->enabled_ctrls,
XkbAccessXKeysMask | XkbAccessXFeedbackMask);
XkbAccessXKeysMask);
if (set_ctrl_from_gconf (desc, client, CONFIG_ROOT "/timeout_enable",
XkbAccessXTimeoutMask)) {
@ -255,7 +255,7 @@ set_server_from_gconf (GConfEntry *ignored)
desc->ctrls->ax_options = set_clear (enable_accessX &&
gconf_client_get_bool (client, CONFIG_ROOT "/feature_state_change_beep", NULL),
desc->ctrls->ax_options, XkbAX_FeatureFBMask | XkbAX_SlowWarnFBMask);
desc->ctrls->ax_options, XkbAccessXFeedbackMask | XkbAX_FeatureFBMask | XkbAX_SlowWarnFBMask);
/* bounce keys */
if (set_ctrl_from_gconf (desc, client, CONFIG_ROOT "/bouncekeys_enable",
@ -264,7 +264,7 @@ set_server_from_gconf (GConfEntry *ignored)
CONFIG_ROOT "/bouncekeys_delay");
desc->ctrls->ax_options = set_clear (
gconf_client_get_bool (client, CONFIG_ROOT "/bouncekeys_beep_reject", NULL),
desc->ctrls->ax_options, XkbAX_BKRejectFBMask);
desc->ctrls->ax_options, XkbAccessXFeedbackMask | XkbAX_BKRejectFBMask);
}
/* mouse keys */
@ -293,13 +293,13 @@ set_server_from_gconf (GConfEntry *ignored)
XkbSlowKeysMask)) {
desc->ctrls->ax_options = set_clear (
gconf_client_get_bool (client, CONFIG_ROOT "/slowkeys_beep_press", NULL),
desc->ctrls->ax_options, XkbAX_SKPressFBMask);
desc->ctrls->ax_options, XkbAccessXFeedbackMask | XkbAX_SKPressFBMask);
desc->ctrls->ax_options = set_clear (
gconf_client_get_bool (client, CONFIG_ROOT "/slowkeys_beep_accept", NULL),
desc->ctrls->ax_options, XkbAX_SKAcceptFBMask);
desc->ctrls->ax_options, XkbAccessXFeedbackMask | XkbAX_SKAcceptFBMask);
desc->ctrls->ax_options = set_clear (
gconf_client_get_bool (client, CONFIG_ROOT "/slowkeys_beep_reject", NULL),
desc->ctrls->ax_options, XkbAX_SKRejectFBMask);
desc->ctrls->ax_options, XkbAccessXFeedbackMask | XkbAX_SKRejectFBMask);
desc->ctrls->slow_keys_delay = get_int (client,
CONFIG_ROOT "/slowkeys_delay");
/* anything larger than 500 seems to loose all keyboard input */
@ -316,13 +316,13 @@ set_server_from_gconf (GConfEntry *ignored)
desc->ctrls->ax_options, XkbAX_TwoKeysMask);
desc->ctrls->ax_options = set_clear (
gconf_client_get_bool (client, CONFIG_ROOT "/stickykeys_modifier_beep", NULL),
desc->ctrls->ax_options, XkbAX_StickyKeysFBMask);
desc->ctrls->ax_options, XkbAccessXFeedbackMask | XkbAX_StickyKeysFBMask);
}
/* toggle keys */
desc->ctrls->ax_options = set_clear (
gconf_client_get_bool (client, CONFIG_ROOT "/togglekeys_enable", NULL),
desc->ctrls->ax_options, XkbAX_IndicatorFBMask);
desc->ctrls->ax_options, XkbAccessXFeedbackMask | XkbAX_IndicatorFBMask);
/*
fprintf (stderr, "CHANGE to : 0x%x\n", desc->ctrls->enabled_ctrls);
@ -506,7 +506,7 @@ set_gconf_from_server (GConfEntry *ignored)
/* always toggle this irrespective of the state */
changed |= set_bool (client, cs, CONFIG_ROOT "/enable",
desc->ctrls->enabled_ctrls & (XkbAccessXKeysMask | XkbAccessXFeedbackMask));
desc->ctrls->enabled_ctrls & XkbAccessXKeysMask);
changed |= set_bool (client, cs, CONFIG_ROOT "/feature_state_change_beep",
desc->ctrls->ax_options & (XkbAX_FeatureFBMask | XkbAX_SlowWarnFBMask));