From fe7da7b6c19a7ad7ea6302496ee93f86985b22e3 Mon Sep 17 00:00:00 2001 From: "Sergey V. Udaltsov" Date: Thu, 3 Feb 2005 23:44:39 +0000 Subject: [PATCH] fixing #165018 --- gnome-settings-daemon/ChangeLog | 4 ++++ gnome-settings-daemon/gnome-settings-keyboard-xkb.c | 12 +++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/gnome-settings-daemon/ChangeLog b/gnome-settings-daemon/ChangeLog index 881fc3916..8cdecafc2 100644 --- a/gnome-settings-daemon/ChangeLog +++ b/gnome-settings-daemon/ChangeLog @@ -1,3 +1,7 @@ +2005-02-03 Sergey V. Udaltsov + + * gnome-settings-keyboard-xkb.c: fix #165018 + 2005-02-01 Elijah Newren * gnome-settings-xmodmap.h: diff --git a/gnome-settings-daemon/gnome-settings-keyboard-xkb.c b/gnome-settings-daemon/gnome-settings-keyboard-xkb.c index 4cb150413..df0d00c24 100644 --- a/gnome-settings-daemon/gnome-settings-keyboard-xkb.c +++ b/gnome-settings-daemon/gnome-settings-keyboard-xkb.c @@ -97,14 +97,14 @@ activation_error (void) GTK_BUTTONS_CLOSE, _ ("Error activating XKB configuration.\n" - "It can have under various circumstances:\n" + "It can happen under various circumstances:\n" "- a bug in libxklavier library\n" "- a bug in X server (xkbcomp, xmodmap utilities)\n" - "- X server with incompatible libxkbfile implemenation\n\n" + "- X server with incompatible libxkbfile implementation\n\n" "X server version data:\n%s\n%d\n%s\n" "If you report this situation as a bug, please include:\n" - "- The result of xprop -root | grep XKB\n" - "- The result of gconftool-2 -R /desktop/gnome/peripherals/keyboard/kbd"), + "- The result of %s\n" + "- The result of %s"), vendor, release, badXFree430Release @@ -113,7 +113,9 @@ activation_error (void) ("You are using XFree 4.3.0.\n" "There are known problems with complex XKB configurations.\n" "Try using simpler configuration or taking more fresh version of XFree software.") - : ""); + : "", + "xprop -root | grep XKB", + "gconftool-2 -R /desktop/gnome/peripherals/keyboard/kbd"); g_signal_connect (msg, "response", G_CALLBACK (gtk_widget_destroy), NULL); gtk_widget_show (msg);