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

long arguing over the string breakage is over. Now gcd shows the error message to unhappy users of .xmodmap with enabled xkb

Browse source
This commit is contained in:
Sergey V. Udaltsov 2004-02-27 19:13:54 +00:00
parent 4a426c7cae
commit 8902014be6
1 changed files with 56 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -26,6 +26,7 @@
# include "config.h" # include "config.h"
#endif #endif
#include <glib/gstrfuncs.h>
#include <gdk/gdk.h> #include <gdk/gdk.h>
#include <gdk/gdkx.h> #include <gdk/gdkx.h>
#include <gconf/gconf-client.h> #include <gconf/gconf-client.h>
@ -44,6 +45,9 @@
static GSwitchItXkbConfig gswic; static GSwitchItXkbConfig gswic;
static gboolean initedOk; static gboolean initedOk;
static const char DISABLE_XMM_WARNING_KEY[] =
"/desktop/gnome/peripherals/keyboard/disable_xmm_and_xkb_warning";
static void static void
activation_error (void) activation_error (void)
{ {
@ -106,12 +110,64 @@ apply_settings (void)
GSwitchItXkbConfigTerm (&gswic); GSwitchItXkbConfigTerm (&gswic);
} }
static void
gnome_settings_keyboard_xkb_chk_lcl_xmm_response (GtkDialog * dlg,
gint response)
{
GConfClient *gcc = gconf_client_get_default ();
switch (response) {
case GTK_RESPONSE_OK:
gconf_client_set_bool (gcc, DISABLE_XMM_WARNING_KEY, TRUE,
NULL);
break;
}
g_object_unref (G_OBJECT (gcc));
gtk_widget_destroy (GTK_WIDGET (dlg));
}
static void
gnome_settings_keyboard_xkb_chk_lcl_xmm (void)
{
GConfClient *gcc = gconf_client_get_default ();
gboolean disableWarning =
gconf_client_get_bool (gcc, DISABLE_XMM_WARNING_KEY, NULL);
GDir *homeDir;
G_CONST_RETURN gchar *fname;
g_object_unref (G_OBJECT (gcc));
if (disableWarning)
return;
homeDir = g_dir_open (g_get_home_dir (), 0, NULL);
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);
g_signal_connect (msg, "response",
G_CALLBACK
(gnome_settings_keyboard_xkb_chk_lcl_xmm_response),
NULL);
gtk_widget_show (msg);
break;
}
g_dir_close (homeDir);
}
void void
gnome_settings_keyboard_xkb_init (GConfClient * client) gnome_settings_keyboard_xkb_init (GConfClient * client)
{ {
if (!XklInit (GDK_DISPLAY ())) { if (!XklInit (GDK_DISPLAY ())) {
XklBackupNamesProp (); XklBackupNamesProp ();
initedOk = TRUE; initedOk = TRUE;
gnome_settings_keyboard_xkb_chk_lcl_xmm ();
gnome_settings_daemon_register_callback gnome_settings_daemon_register_callback
("/desktop/gnome/peripherals/keyboard/xkb", ("/desktop/gnome/peripherals/keyboard/xkb",
(KeyCallbackFunc) apply_settings); (KeyCallbackFunc) apply_settings);