View | Details | Raw Unified | Return to bug 20816
Collapse All | Expand All

(-)plugins/keyboard/gsd-keyboard-xkb.c (-3 / +4 lines)
Lines 252-262 apply_xkb_settings (void) Link Here
252
	gkbd_keyboard_config_init (&current_sys_kbd_config,
252
	gkbd_keyboard_config_init (&current_sys_kbd_config,
253
				   conf_client, xkl_engine);
253
				   conf_client, xkl_engine);
254
254
255
	gkbd_keyboard_config_load_from_gconf (&current_kbd_config,
256
					      &initial_sys_kbd_config);
257
258
	gkbd_keyboard_config_load_from_x_current (&current_sys_kbd_config,
255
	gkbd_keyboard_config_load_from_x_current (&current_sys_kbd_config,
259
						  NULL);
256
						  NULL);
257
//						  &initial_sys_kbd_config);
258
259
	gkbd_keyboard_config_load_from_gconf (&current_kbd_config,
260
					      &current_sys_kbd_config);
260
261
261
	if (gdm_layout != NULL) {
262
	if (gdm_layout != NULL) {
262
		/* If there are multiple layouts,
263
		/* If there are multiple layouts,

Return to bug 20816