Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-control-center/gnome-settings-daemon/ChangeLog,v
retrieving revision 1.40
diff -u -w -r1.40 ChangeLog
--- ChangeLog	30 Mar 2002 04:52:52 -0000	1.40
+++ ChangeLog	1 Apr 2002 15:49:54 -0000
@@ -1,3 +1,15 @@
+2002-04-01  Jody Goldberg <jody@gnome.org>
+
+	http://bugzilla.gnome.org/show_bug.cgi?id=77203
+	* gnome-settings-accessibility-keyboard.c (set_gconf_from_server) : be
+	  more anal about serer failure.
+	(set_server_from_gconf) : ditto.
+
+2002-03-30  Jody Goldberg <jody@gnome.org>
+
+	* gnome-settings-xsettings.c (translations) : reorder to match gdk.
+	  This simplifies maintenance.
+
 2002-03-29  Jody Goldberg <jody@gnome.org>
 
 	* gnome-settings-accessibility-keyboard.c
Index: gnome-settings-accessibility-keyboard.c
===================================================================
RCS file: /cvs/gnome/gnome-control-center/gnome-settings-daemon/gnome-settings-accessibility-keyboard.c,v
retrieving revision 1.7
diff -u -w -r1.7 gnome-settings-accessibility-keyboard.c
--- gnome-settings-accessibility-keyboard.c	30 Mar 2002 04:52:52 -0000	1.7
+++ gnome-settings-accessibility-keyboard.c	1 Apr 2002 15:49:54 -0000
@@ -79,6 +79,7 @@
 	gint32 		 enabled, enable_mask;
 	XkbDescRec	*desc;
 	GConfClient	*client = gconf_client_get_default ();
+	Status		 status;
 
 	if (we_are_changing_xkb_state) {
 		d ("We changed gconf accessibility state\n");
@@ -98,8 +99,14 @@
 
 	enabled = XkbAccessXFeedbackMask;
 
+	gdk_error_trap_push ();
 	desc = XkbGetMap(GDK_DISPLAY (), 0, XkbUseCoreKbd);
-	XkbGetControls (GDK_DISPLAY (), XkbAllControlsMask, desc);
+	status = XkbGetControls (GDK_DISPLAY (), XkbAllControlsMask, desc);
+	gdk_error_trap_pop ();
+
+	g_return_if_fail (status != Success);
+	g_return_if_fail (desc != NULL);
+	g_return_if_fail (desc->ctrls != NULL);
 
 	desc->ctrls->ax_options = XkbAX_LatchToLockMask;
 
@@ -182,12 +189,17 @@
 {
 	XkbDescRec	*desc;
 	GConfClient	*client = gconf_client_get_default ();
+	Status		 status;
 
 	gdk_error_trap_push ();
 	desc = XkbGetMap(GDK_DISPLAY (), 0, XkbUseCoreKbd);
-	XkbGetControls (GDK_DISPLAY (), XkbAllControlsMask, desc);
+	status = XkbGetControls (GDK_DISPLAY (), XkbAllControlsMask, desc);
 	XFlush (GDK_DISPLAY ());
 	gdk_error_trap_pop ();
+
+	g_return_if_fail (status != Success);
+	g_return_if_fail (desc != NULL);
+	g_return_if_fail (desc->ctrls != NULL);
 
 	desc->ctrls->ax_options = XkbAX_LatchToLockMask;
 
