Updating branch refs/heads/master
to 38e24bbf265081f31c5690c0f6db88c08cbfe825 (commit)
from 114b4ed351d5fdc4d80fbfb9acd704a54cc43761 (commit)
commit 38e24bbf265081f31c5690c0f6db88c08cbfe825
Author: Yves-Alexis Perez <[email protected]>
Date: Thu Feb 24 23:41:16 2011 +0100
Don't auto-expire sticky keys if enabled (bug #6305).
xfce4-settings-helper/accessibility.c | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/xfce4-settings-helper/accessibility.c
b/xfce4-settings-helper/accessibility.c
index a559607..0cb0e19 100644
--- a/xfce4-settings-helper/accessibility.c
+++ b/xfce4-settings-helper/accessibility.c
@@ -186,6 +186,10 @@ xfce_accessibility_helper_set_xkb (XfceAccessibilityHelper
*helper,
/* we always change this, so add it to the mask */
SET_FLAG (mask, XkbControlsEnabledMask);
+ /* if setting sticky keys, we set expiration too */
+ if (HAS_FLAG (mask, XkbStickyKeysMask))
+ SET_FLAG (mask, XkbAccessXTimeoutMask);
+
/* add the mouse keys values mask if needed */
if (HAS_FLAG (mask, XkbMouseKeysMask))
SET_FLAG (mask, XkbMouseKeysAccelMask);
@@ -199,6 +203,8 @@ xfce_accessibility_helper_set_xkb (XfceAccessibilityHelper
*helper,
if (xfconf_channel_get_bool (helper->channel, "/StickyKeys",
FALSE))
{
SET_FLAG (xkb->ctrls->enabled_ctrls, XkbStickyKeysMask);
+ UNSET_FLAG (xkb->ctrls->axt_ctrls_mask, XkbStickyKeysMask);
+ UNSET_FLAG (xkb->ctrls->axt_ctrls_values, XkbStickyKeysMask);
if (xfconf_channel_get_bool (helper->channel,
"/StickyKeys/LatchToLock", FALSE))
SET_FLAG (xkb->ctrls->ax_options, XkbAX_LatchToLockMask);
@@ -213,6 +219,8 @@ xfce_accessibility_helper_set_xkb (XfceAccessibilityHelper
*helper,
else
{
UNSET_FLAG (xkb->ctrls->enabled_ctrls, XkbStickyKeysMask);
+ SET_FLAG (xkb->ctrls->axt_ctrls_mask, XkbStickyKeysMask);
+ UNSET_FLAG (xkb->ctrls->axt_ctrls_values, XkbStickyKeysMask);
}
}
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
