From 2ab41bb8cc96e7b6dea6b878bb9b5cf5e885e1f9 Mon Sep 17 00:00:00 2001 From: Jody Goldberg Date: Sat, 28 Aug 2004 01:42:25 +0000 Subject: [PATCH] http://bugzilla.gnome.org/show_bug.cgi?id=148291 typo 2004-07-23 Jody Goldberg http://bugzilla.gnome.org/show_bug.cgi?id=148291 * configure.in : typo 2004-06-07 Jody Goldberg * po/POTFILES.in : add server file, still unused without the patch * configure.in : ditto. 2004-06-01 Jody Goldberg * schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in : Add xkb/update_handlers. --- ChangeLog | 15 ++++++++ NEWS | 6 ++++ configure.in | 3 +- .../gnome-settings-keyboard-xkb.c | 22 ++++++------ ..._gnome_peripherals_keyboard_xkb.schemas.in | 36 ++++++++----------- 5 files changed, 47 insertions(+), 35 deletions(-) diff --git a/ChangeLog b/ChangeLog index b8ce80fce..fa29de89d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2004-07-23 Jody Goldberg + + http://bugzilla.gnome.org/show_bug.cgi?id=148291 + * configure.in : typo + +2004-06-07 Jody Goldberg + + * po/POTFILES.in : add server file, still unused without the patch + * configure.in : ditto. + +2004-06-01 Jody Goldberg + + * schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in : Add + xkb/update_handlers. + 2004-08-17 Kjartan Maraas * configure.in: Added «nb» to ALL_LINGUAS. diff --git a/NEWS b/NEWS index de456ec1b..48ac84c2c 100644 --- a/NEWS +++ b/NEWS @@ -5,9 +5,15 @@ gnome-control-center 2.7.0 ------------------------------------------------------------------------------ gnome-control-center 2.6.1 +Jody: + * Add the ximian shell to the tarball and polish it up a bit + Michael Terry: * Fix ui-review comments for keybinding capplet +Sergey: + * Add a hook to libgswitchit to notify when xkb is reloaded + Shailesh Mittal: http://bugzilla.gnome.org/show_bug.cgi?id=114832 * IPV6 support in the file types capplet diff --git a/configure.in b/configure.in index b55fd3268..7b8c86b5e 100644 --- a/configure.in +++ b/configure.in @@ -290,7 +290,7 @@ AC_SUBST(GDK_PIXBUF_CSOURCE) AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal, no) -if text x"$GLIB_GENMARSHAL" = xno; then +if test x"$GLIB_GENMARSHAL" = xno; then AC_MSG_ERROR([glib-genmarshal executable not found in your path - should be installed with glib]) fi @@ -519,6 +519,7 @@ gnome-settings-daemon/Makefile gnome-settings-daemon/xrdb/Makefile gnome-settings-daemon/actions/Makefile control-center/Makefile +control-center/GNOME_ControlCenter.server libbackground/Makefile libwindow-settings/Makefile libwindow-settings/gnome-window-settings-2.0.pc diff --git a/gnome-settings-daemon/gnome-settings-keyboard-xkb.c b/gnome-settings-daemon/gnome-settings-keyboard-xkb.c index 42aebc748..866d009bb 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; -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), diff --git a/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in b/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in index 934d215e6..ffc9e2c3b 100644 --- a/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in +++ b/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas.in @@ -2,15 +2,10 @@ /schemas/desktop/gnome/peripherals/keyboard/xkb/overrideSettings - /desktop/gnome/peripherals/keyboard/xkb/overrideSettings - gnome - bool - true - XKB settings in gconf will be overridden from the system ASAP Very soon, XKB settings in gconf will be overridden (from the system configuration) @@ -19,15 +14,10 @@ /schemas/desktop/gnome/peripherals/keyboard/xkb/model - /desktop/gnome/peripherals/keyboard/xkb/model - gnome - string - pc105 - XKB keyboard model XKB keyboard model @@ -36,17 +26,11 @@ /schemas/desktop/gnome/peripherals/keyboard/xkb/layouts - /desktop/gnome/peripherals/keyboard/xkb/layouts - gnome - list - string - [us] - XKB keyboard layout XKB keyboard layout @@ -55,22 +39,30 @@ /schemas/desktop/gnome/peripherals/keyboard/xkb/options - /desktop/gnome/peripherals/keyboard/xkb/options - gnome - list - string - [] - XKB options XKB options + + /schemas/desktop/gnome/peripherals/keyboard/xkb/update_handlers + /desktop/gnome/peripherals/keyboard/xkb/update_handlers + gnome + list + string + [] + + XKB Update Handlers + A collection of scripts to run whenever the XKB state is + reloaded. Useful for re-applying xmodmap based adjustments + + +