[gnome-settings-daemon] Patching xkb config with xmodmap regardless of the difference between current and xkb config

[Sergey V. Udaltsov <svu src gnome org>]

commit bd8e82c0936f9cd014b303b768c06e9bc446b58e
Author: Sergey V. Udaltsov <svu gnome org>
Date:   Sun Apr 1 01:39:48 2012 +0100

    Patching xkb config with xmodmap regardless of the difference between current and xkb config
    
    Even if XKB configs are same, xmodmap should be activated.
    https://bugzilla.gnome.org/show_bug.cgi?id=660000

 configure.ac                        |    2 +-
 plugins/keyboard/gsd-keyboard-xkb.c |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f73583e..9e8485b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -175,7 +175,7 @@ dnl ---------------------------------------------------------------------------
 dnl - Keyboard plugin stuff
 dnl ---------------------------------------------------------------------------
 
-LIBGNOMEKBD_REQUIRED=2.91.1
+LIBGNOMEKBD_REQUIRED=3.5.1
 PKG_CHECK_MODULES(KEYBOARD, [libgnomekbdui >= $LIBGNOMEKBD_REQUIRED libgnomekbd >= $LIBGNOMEKBD_REQUIRED libxklavier >= 5.0 kbproto])
 
 dnl ---------------------------------------------------------------------------
diff --git a/plugins/keyboard/gsd-keyboard-xkb.c b/plugins/keyboard/gsd-keyboard-xkb.c
index fbfaba3..3671b79 100644
--- a/plugins/keyboard/gsd-keyboard-xkb.c
+++ b/plugins/keyboard/gsd-keyboard-xkb.c
@@ -330,6 +330,7 @@ try_activating_xkb_config_if_new (GkbdKeyboardConfig *
 			return FALSE;
 		}
 	}
+	gkbd_keyboard_config_patch (&current_kbd_config);
 	return TRUE;
 }