From 03def60e2fc77abe503f70cfd26bb3a5a68c0786 Mon Sep 17 00:00:00 2001 From: Jody Goldberg Date: Fri, 3 Sep 2004 19:56:16 +0000 Subject: [PATCH] revert unintended string change 2004-09-03 Jody Goldberg * gnome-settings-daemon/gnome-settings-keyboard-xkb.c : revert unintended string change --- ChangeLog | 5 +++++ .../gnome-settings-keyboard-xkb.c | 20 ++++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index caa89a1e9..824210cbb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-09-03 Jody Goldberg + + * gnome-settings-daemon/gnome-settings-keyboard-xkb.c : revert + unintended string change + 2004-08-31 Jody Goldberg * capplets/common/gconf-property-editor.c diff --git a/gnome-settings-daemon/gnome-settings-keyboard-xkb.c b/gnome-settings-daemon/gnome-settings-keyboard-xkb.c index 866d009bb..bd7336d7b 100644 --- a/gnome-settings-daemon/gnome-settings-keyboard-xkb.c +++ b/gnome-settings-daemon/gnome-settings-keyboard-xkb.c @@ -48,8 +48,8 @@ static gboolean initedOk; static PostActivationCallback paCallback = NULL; static void *paCallbackUserData = NULL; -#define DISABLE_XMM_WARNING_KEY \ - "/desktop/gnome/peripherals/keyboard/disable_xmm_and_xkb_warning" +static const char DISABLE_XMM_WARNING_KEY[] = + "/desktop/gnome/peripherals/keyboard/disable_xmm_and_xkb_warning"; typedef enum { RESPONSE_USE_X, @@ -217,13 +217,15 @@ gnome_settings_keyboard_xkb_chk_lcl_xmm (void) if (homeDir == NULL) return; while ((fname = g_dir_read_name (homeDir)) != NULL) - if (strlen (fname) >= 8 && - !g_ascii_strncasecmp (fname, ".xmodmap", 8)) { - GtkWidget *msg = gtk_message_dialog_new_with_markup (NULL, 0, - GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, - _("You have a keyboard remapping file (%s) in " - "your home directory whose contents are ignored by default. " - "Add it to /desktop/gnome/peripherals/keyboard/xkb/update_handlers"), + if (strlen (fname) >= 8 + && !g_ascii_strncasecmp (fname, ".xmodmap", 8)) { + GtkWidget *msg = + gtk_message_dialog_new_with_markup (NULL, 0, + GTK_MESSAGE_WARNING, + GTK_BUTTONS_OK, + _ + ("You have a keyboard remapping file (%s) in your home directory whose contents will now be ignored." + " You can use the keyboard preferences to restore them."), fname); g_signal_connect (msg, "response", G_CALLBACK