Probably a bit less of troubles. At least we do the proper properties backup now.

This commit is contained in:
Sergey V. Udaltsov 2003-11-26 22:48:59 +00:00
parent 66cb02bd8c
commit 49557bf908

View file

@ -53,10 +53,9 @@ activation_error (void)
&& (release / 100000 == 403); && (release / 100000 == 403);
GtkWidget *msg = gtk_message_dialog_new (NULL, GtkWidget *msg = gtk_message_dialog_new (NULL,
GTK_DIALOG_MODAL | 0,
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR, GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK, GTK_BUTTONS_CLOSE,
_ _
("Error activating XKB configuration.\n" ("Error activating XKB configuration.\n"
"Probably internal X server problem.\n\nX server version data:\n%s\n%d\n%s"), "Probably internal X server problem.\n\nX server version data:\n%s\n%d\n%s"),
@ -68,8 +67,9 @@ activation_error (void)
"There are known problems with complex XKB configurations.\n" "There are known problems with complex XKB configurations.\n"
"Try using simpler configuration or taking more fresh version of XFree software.") "Try using simpler configuration or taking more fresh version of XFree software.")
: ""); : "");
gtk_dialog_run (GTK_DIALOG (msg)); g_signal_connect (msg, "response",
gtk_widget_destroy (msg); G_CALLBACK (gtk_widget_destroy), NULL);
gtk_widget_show (msg);
} }
static void static void
@ -99,6 +99,7 @@ void
gnome_settings_keyboard_xkb_init (GConfClient * client) gnome_settings_keyboard_xkb_init (GConfClient * client)
{ {
if (!XklInit (GDK_DISPLAY ())) { if (!XklInit (GDK_DISPLAY ())) {
XklBackupNamesProp ();
initedOk = TRUE; initedOk = TRUE;
gnome_settings_daemon_register_callback gnome_settings_daemon_register_callback
("/desktop/gnome/peripherals/keyboard/xkb", ("/desktop/gnome/peripherals/keyboard/xkb",