diff options
| author | Jasmine Hassan <[email protected]> | 2012-12-05 03:10:27 +0200 |
|---|---|---|
| committer | Jasmine Hassan <[email protected]> | 2012-12-06 18:48:25 +0200 |
| commit | f86fbc0aa5809b6afd3a88cdf3badb0576294c9f (patch) | |
| tree | 930442ccc8fba815aae17d14a0a2bf04062f25cc /plugins/keyboard/msd-keyboard-manager.c | |
| parent | 75e8a3f7a9322bba1cff478e35b6e15203d78aa8 (diff) | |
| download | mate-settings-daemon-f86fbc0aa5809b6afd3a88cdf3badb0576294c9f.tar.bz2 mate-settings-daemon-f86fbc0aa5809b6afd3a88cdf3badb0576294c9f.tar.xz | |
[keyboard] remove horrible xmodmap fallback code
had xklavier-related warning everytime m-s-d is started, specifically after
we stopped daemonizing the daemon, in a previous commit.
and the bug revolves around libxklavier issue
https://bugzilla.gnome.org/show_bug.cgi?id=150542
http://git.gnome.org/browse/gnome-settings-daemon/commit/?id=4239cb8a5d73af79d2cdf0f294a33d31fbbb9afe
http://git.gnome.org/browse/gnome-settings-daemon/commit/?id=241c970c1361c4d1b2663af20252ef127055d768
Diffstat (limited to 'plugins/keyboard/msd-keyboard-manager.c')
| -rw-r--r-- | plugins/keyboard/msd-keyboard-manager.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/plugins/keyboard/msd-keyboard-manager.c b/plugins/keyboard/msd-keyboard-manager.c index 293fb18..a4b97e5 100644 --- a/plugins/keyboard/msd-keyboard-manager.c +++ b/plugins/keyboard/msd-keyboard-manager.c @@ -50,7 +50,6 @@ #include "msd-keyboard-manager.h" #include "msd-keyboard-xkb.h" -#include "msd-xmodmap.h" #define MSD_KEYBOARD_MANAGER_GET_PRIVATE(o) \ (G_TYPE_INSTANCE_GET_PRIVATE((o), MSD_TYPE_KEYBOARD_MANAGER, MsdKeyboardManagerPrivate)) @@ -333,7 +332,6 @@ start_keyboard_idle_cb (MsdKeyboardManager *manager) manager->priv->settings = g_settings_new (MSD_KEYBOARD_SCHEMA); /* Essential - xkb initialization should happen before */ - msd_keyboard_xkb_set_post_activation_callback ((PostActivationCallback) msd_load_modmap_files, NULL); msd_keyboard_xkb_init (manager); #ifdef HAVE_X11_EXTENSIONS_XKB_H |