gnome-settings-daemon r548 - in branches/gnome-2-24: . plugins/a11y-keyboard

[jensg svn gnome org]

Author: jensg
Date: Sun Oct  5 10:22:06 2008
New Revision: 548
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=548&view=rev

Log:
2008-10-05  Jens Granseuer  <jensgr gmx net>

	Merged from trunk.
                                         
	* plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:
	(set_server_from_gconf): don't make togglekeys_enable depend on
	global AccessX state (bug #555009)


Modified:
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c

Modified: branches/gnome-2-24/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
==============================================================================
--- branches/gnome-2-24/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c	(original)
+++ branches/gnome-2-24/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c	Sun Oct  5 10:22:06 2008
@@ -317,8 +317,7 @@
         }
 
         /* toggle keys */
-        desc->ctrls->ax_options = set_clear (enable_accessX &&
-                                             gconf_client_get_bool (client, CONFIG_ROOT "/togglekeys_enable", NULL),
+        desc->ctrls->ax_options = set_clear (gconf_client_get_bool (client, CONFIG_ROOT "/togglekeys_enable", NULL),
                                              desc->ctrls->ax_options,
                                              XkbAccessXFeedbackMask | XkbAX_IndicatorFBMask);