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

http://bugzilla.gnome.org/show_bug.cgi?id=77203 be more anal about server

Browse source 
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 server 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.
This commit is contained in:
Jody Goldberg 2002-04-10 23:30:45 +00:00 • committed by Jody Goldberg
parent 13c9efe9d6
commit 68b79b4fab
4 changed files with 54 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

12
gnome-settings-daemon/ChangeLog
View file

@ -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 server 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.
Tue Apr 9 11:58:10 2002 Jonathan Blandford <jrb@gnome.org> Tue Apr 9 11:58:10 2002 Jonathan Blandford <jrb@gnome.org>
* Makefile.am: Add commented out disk support until I finish the code. * Makefile.am: Add commented out disk support until I finish the code.

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

@ -79,6 +79,18 @@ set_server_from_gconf (GConfEntry *ignored)
gint32 enabled, enable_mask; gint32 enabled, enable_mask;
XkbDescRec *desc; XkbDescRec *desc;
GConfClient *client = gconf_client_get_default (); GConfClient *client = gconf_client_get_default ();
Status status;
gdk_error_trap_push ();
desc = XkbGetMap (GDK_DISPLAY (), XkbAllMapComponentsMask, XkbUseCoreKbd);
desc->ctrls = NULL;
status = XkbGetControls (GDK_DISPLAY (), XkbAllControlsMask, desc);
XSync (GDK_DISPLAY (), FALSE);
gdk_error_trap_pop ();
g_return_if_fail (status == Success);
g_return_if_fail (desc != NULL);
g_return_if_fail (desc->ctrls != NULL);
if (we_are_changing_xkb_state) { if (we_are_changing_xkb_state) {
d ("We changed gconf accessibility state\n"); d ("We changed gconf accessibility state\n");
@ -86,6 +98,8 @@ set_server_from_gconf (GConfEntry *ignored)
} else } else
d ("Someone changed gconf accessibility state\n"); d ("Someone changed gconf accessibility state\n");
desc->ctrls->ax_options = XkbAX_LatchToLockMask;
enable_mask = XkbAccessXKeysMask | enable_mask = XkbAccessXKeysMask |
XkbSlowKeysMask | XkbSlowKeysMask |
XkbBounceKeysMask | XkbBounceKeysMask |
@ -98,11 +112,6 @@ set_server_from_gconf (GConfEntry *ignored)
enabled = XkbAccessXFeedbackMask; enabled = XkbAccessXFeedbackMask;
desc = XkbGetMap(GDK_DISPLAY (), 0, XkbUseCoreKbd);
XkbGetControls (GDK_DISPLAY (), XkbAllControlsMask, desc);
desc->ctrls->ax_options = XkbAX_LatchToLockMask;
/* general */ /* general */
if (gconf_client_get_bool (client, CONFIG_ROOT "/enable", NULL)) if (gconf_client_get_bool (client, CONFIG_ROOT "/enable", NULL))
enabled |= XkbAccessXKeysMask; enabled |= XkbAccessXKeysMask;
@ -172,7 +181,7 @@ set_server_from_gconf (GConfEntry *ignored)
gdk_error_trap_push (); gdk_error_trap_push ();
we_are_changing_xkb_state = TRUE; we_are_changing_xkb_state = TRUE;
XkbSetControls (GDK_DISPLAY (), which, desc); XkbSetControls (GDK_DISPLAY (), which, desc);
gdk_flush (); XSync (GDK_DISPLAY (), FALSE);
we_are_changing_xkb_state = FALSE; we_are_changing_xkb_state = FALSE;
gdk_error_trap_pop (); gdk_error_trap_pop ();
} }
@ -182,13 +191,19 @@ set_gconf_from_server (GConfEntry *ignored)
{ {
XkbDescRec *desc; XkbDescRec *desc;
GConfClient *client = gconf_client_get_default (); GConfClient *client = gconf_client_get_default ();
Status status;
gdk_error_trap_push (); gdk_error_trap_push ();
desc = XkbGetMap(GDK_DISPLAY (), 0, XkbUseCoreKbd); desc = XkbGetMap (GDK_DISPLAY (), XkbAllMapComponentsMask, XkbUseCoreKbd);
XkbGetControls (GDK_DISPLAY (), XkbAllControlsMask, desc); desc->ctrls = NULL;
XFlush (GDK_DISPLAY ()); status = XkbGetControls (GDK_DISPLAY (), XkbAllControlsMask, desc);
XSync (GDK_DISPLAY (), FALSE);
gdk_error_trap_pop (); 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; desc->ctrls->ax_options = XkbAX_LatchToLockMask;
/* guard against reloading the server when gconf notices that the state /* guard against reloading the server when gconf notices that the state
@ -287,7 +302,7 @@ gnome_settings_accessibility_keyboard_init (GConfClient *client)
XkbSelectEvents (GDK_DISPLAY (), XkbSelectEvents (GDK_DISPLAY (),
XkbUseCoreKbd, XkbAllEventsMask, XkbAllEventsMask); XkbUseCoreKbd, XkbAllEventsMask, XkbAllEventsMask);
XFlush (GDK_DISPLAY ()); XSync (GDK_DISPLAY (), FALSE);
gdk_error_trap_pop (); gdk_error_trap_pop ();
gdk_window_add_filter (NULL, &cb_xkb_event_filter, NULL); gdk_window_add_filter (NULL, &cb_xkb_event_filter, NULL);

2
gnome-settings-daemon/gnome-settings-keyboard.c
View file

@ -96,7 +96,7 @@ apply_settings (void)
XChangeKeyboardControl (GDK_DISPLAY (), KBKeyClickPercent, XChangeKeyboardControl (GDK_DISPLAY (), KBKeyClickPercent,
&kbdcontrol); &kbdcontrol);
XFlush (GDK_DISPLAY ()); XSync (GDK_DISPLAY (), FALSE);
gdk_error_trap_pop (); gdk_error_trap_pop ();
} }

32
gnome-settings-daemon/gnome-settings-xsettings.c
View file

@ -62,24 +62,24 @@ translate_string_string (TranslationEntry *trans,
} }
static TranslationEntry translations [] = { static TranslationEntry translations [] = {
{ "/desktop/gnome/peripherals/mouse/double_click", "Net/DoubleClickTime", GCONF_VALUE_INT, { "/desktop/gnome/peripherals/mouse/double_click", "Net/DoubleClickTime",
translate_int_int }, GCONF_VALUE_INT, translate_int_int },
{ "/desktop/gnome/gtk-color-palette", "Gtk/ColorPalette", GCONF_VALUE_STRING, { "/desktop/gnome/gtk-color-palette", "Gtk/ColorPalette",
translate_string_string }, GCONF_VALUE_STRING, translate_string_string },
{ "/desktop/gnome/gtk-toolbar-style", "Gtk/ToolbarStyle", GCONF_VALUE_STRING, { "/desktop/gnome/interface/font_name", "Gtk/FontName",
translate_string_string }, GCONF_VALUE_STRING, translate_string_string },
{ "/desktop/gnome/gtk-toolbar-icon-size", "Gtk/ToolbarIconSize", GCONF_VALUE_STRING, { "/desktop/gnome/interface/gtk_key_theme", "Gtk/KeyThemeName",
translate_string_string }, GCONF_VALUE_STRING, translate_string_string },
{ "/desktop/gnome/interface/gtk_theme", "Net/ThemeName", GCONF_VALUE_STRING, { "/desktop/gnome/gtk-toolbar-style", "Gtk/ToolbarStyle",
translate_string_string }, GCONF_VALUE_STRING, translate_string_string },
{ "/desktop/gnome/interface/gtk_key_theme", "Gtk/KeyThemeName", GCONF_VALUE_STRING, { "/desktop/gnome/gtk-toolbar-icon-size", "Gtk/ToolbarIconSize",
translate_string_string }, GCONF_VALUE_STRING, translate_string_string },
{ "/desktop/gnome/interface/font_name", "Gtk/FontName", GCONF_VALUE_STRING,
translate_string_string },
{ "/desktop/gnome/interface/cursor_blink", "Net/CursorBlink", { "/desktop/gnome/interface/cursor_blink", "Net/CursorBlink",
GCONF_VALUE_BOOL, translate_bool_int }, GCONF_VALUE_BOOL, translate_bool_int },
{ "/desktop/gnome/interface/cursor_blink_time", "Net/CursorBlinkTime", { "/desktop/gnome/interface/cursor_blink_time", "Net/CursorBlinkTime",
GCONF_VALUE_INT, translate_int_int } GCONF_VALUE_INT, translate_int_int },
{ "/desktop/gnome/interface/gtk_theme", "Net/ThemeName",
GCONF_VALUE_STRING, translate_string_string }
}; };
static TranslationEntry* static TranslationEntry*