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

revert unintended string change

Browse source 
2004-09-03  Jody Goldberg <jody@gnome.org>

	* gnome-settings-daemon/gnome-settings-keyboard-xkb.c : revert
	  unintended string change
This commit is contained in:
Jody Goldberg 2004-09-03 19:56:16 +00:00 • committed by Jody Goldberg
parent ce1635dbff
commit 03def60e2f
2 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2004-09-03 Jody Goldberg <jody@gnome.org>
* gnome-settings-daemon/gnome-settings-keyboard-xkb.c : revert
unintended string change
2004-08-31 Jody Goldberg <jody@gnome.org> 2004-08-31 Jody Goldberg <jody@gnome.org>
* capplets/common/gconf-property-editor.c * capplets/common/gconf-property-editor.c

20
gnome-settings-daemon/gnome-settings-keyboard-xkb.c
View file

@ -48,8 +48,8 @@ static gboolean initedOk;
static PostActivationCallback paCallback = NULL; static PostActivationCallback paCallback = NULL;
static void *paCallbackUserData = NULL; static void *paCallbackUserData = NULL;
#define DISABLE_XMM_WARNING_KEY \ static const char DISABLE_XMM_WARNING_KEY[] =
"/desktop/gnome/peripherals/keyboard/disable_xmm_and_xkb_warning" "/desktop/gnome/peripherals/keyboard/disable_xmm_and_xkb_warning";
typedef enum { typedef enum {
RESPONSE_USE_X, RESPONSE_USE_X,
@ -217,13 +217,15 @@ gnome_settings_keyboard_xkb_chk_lcl_xmm (void)
if (homeDir == NULL) if (homeDir == NULL)
return; return;
while ((fname = g_dir_read_name (homeDir)) != NULL) while ((fname = g_dir_read_name (homeDir)) != NULL)
if (strlen (fname) >= 8 && if (strlen (fname) >= 8
!g_ascii_strncasecmp (fname, ".xmodmap", 8)) { && !g_ascii_strncasecmp (fname, ".xmodmap", 8)) {
GtkWidget *msg = gtk_message_dialog_new_with_markup (NULL, 0, GtkWidget *msg =
GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, gtk_message_dialog_new_with_markup (NULL, 0,
_("You have a keyboard remapping file (%s) in " GTK_MESSAGE_WARNING,
"your home directory whose contents are ignored by default. " GTK_BUTTONS_OK,
"Add it to /desktop/gnome/peripherals/keyboard/xkb/update_handlers"), _
("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); fname);
g_signal_connect (msg, "response", g_signal_connect (msg, "response",
G_CALLBACK G_CALLBACK