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

get really anal about potential X errors. (set_gconf_from_server) : ditto.

Browse source 
2002-03-29  Jody Goldberg <jody@gnome.org>

	* gnome-settings-accessibility-keyboard.c
	(gnome_settings_accessibility_keyboard_init) : get really anal about
	  potential X errors.
	(set_gconf_from_server) : ditto.
This commit is contained in:
Jody Goldberg 2002-03-30 04:52:52 +00:00 • committed by Jody Goldberg
parent d80e0c86be
commit 6e7a639581
2 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
gnome-settings-daemon/ChangeLog
View file

@ -1,3 +1,10 @@
2002-03-29 Jody Goldberg <jody@gnome.org>
* gnome-settings-accessibility-keyboard.c
(gnome_settings_accessibility_keyboard_init) : get really anal about
potential X errors.
(set_gconf_from_server) : ditto.
2002-03-29 Jody Goldberg <jody@gnome.org> 2002-03-29 Jody Goldberg <jody@gnome.org>
* gnome-settings-accessibility-keyboard.c (set_server_from_gconf) : * gnome-settings-accessibility-keyboard.c (set_server_from_gconf) :

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

@ -183,8 +183,11 @@ set_gconf_from_server (GConfEntry *ignored)
XkbDescRec *desc; XkbDescRec *desc;
GConfClient *client = gconf_client_get_default (); GConfClient *client = gconf_client_get_default ();
gdk_error_trap_push ();
desc = XkbGetMap(GDK_DISPLAY (), 0, XkbUseCoreKbd); desc = XkbGetMap(GDK_DISPLAY (), 0, XkbUseCoreKbd);
XkbGetControls (GDK_DISPLAY (), XkbAllControlsMask, desc); XkbGetControls (GDK_DISPLAY (), XkbAllControlsMask, desc);
XFlush (GDK_DISPLAY ());
gdk_error_trap_pop ();
desc->ctrls->ax_options = XkbAX_LatchToLockMask; desc->ctrls->ax_options = XkbAX_LatchToLockMask;
@ -275,13 +278,18 @@ gnome_settings_accessibility_keyboard_init (GConfClient *client)
{ {
int opcode, errorBase, major, minor; int opcode, errorBase, major, minor;
gdk_error_trap_push ();
if (!XkbQueryExtension (GDK_DISPLAY (), if (!XkbQueryExtension (GDK_DISPLAY (),
&opcode, &xkbEventBase, &errorBase, &major, &minor) || &opcode, &xkbEventBase, &errorBase, &major, &minor) ||
!XkbUseExtension (GDK_DISPLAY (), &major, &minor)) !XkbUseExtension (GDK_DISPLAY (), &major, &minor))
return; return;
XkbSelectEvents (GDK_DISPLAY (), XkbSelectEvents (GDK_DISPLAY (),
XkbUseCoreKbd, XkbAllEventsMask, XkbAllEventsMask); XkbUseCoreKbd, XkbAllEventsMask, XkbAllEventsMask);
XFlush (GDK_DISPLAY ());
gdk_error_trap_pop ();
gdk_window_add_filter (NULL, &cb_xkb_event_filter, NULL); gdk_window_add_filter (NULL, &cb_xkb_event_filter, NULL);
gnome_settings_daemon_register_callback (CONFIG_ROOT, &set_server_from_gconf); gnome_settings_daemon_register_callback (CONFIG_ROOT, &set_server_from_gconf);