2004-07-23  Jody Goldberg <jody@gnome.org>

	http://bugzilla.gnome.org/show_bug.cgi?id=148291
	* configure.in : typo

2004-06-07  Jody Goldberg <jody@gnome.org>

	* po/POTFILES.in : add server file, still unused without the patch
	* configure.in : ditto.

2004-06-01  Jody Goldberg <jody@gnome.org>

	* schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in : Add
	  xkb/update_handlers.
This commit is contained in:
Jody Goldberg 2004-08-28 01:42:25 +00:00 committed by Jody Goldberg
parent c8763b95a7
commit 2ab41bb8cc
5 changed files with 47 additions and 35 deletions

View file

@ -48,8 +48,8 @@ static gboolean initedOk;
static PostActivationCallback paCallback = NULL;
static void *paCallbackUserData = NULL;
static const char DISABLE_XMM_WARNING_KEY[] =
"/desktop/gnome/peripherals/keyboard/disable_xmm_and_xkb_warning";
#define DISABLE_XMM_WARNING_KEY \
"/desktop/gnome/peripherals/keyboard/disable_xmm_and_xkb_warning"
typedef enum {
RESPONSE_USE_X,
@ -217,16 +217,14 @@ 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 will now be ignored."
" You can use the keyboard preferences to restore them."),
fname);
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"),
fname);
g_signal_connect (msg, "response",
G_CALLBACK
(gnome_settings_keyboard_xkb_chk_lcl_xmm_response),