diff options
| author | Stefano Karapetsas <[email protected]> | 2012-12-07 06:06:41 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2012-12-07 06:06:41 -0800 |
| commit | 12dcf19aa5f51901053c273cd7f5c17ce85e909d (patch) | |
| tree | 5b71387df7bf817dd5d0dff60ecc09d8291dba0d /plugins/keyboard/msd-keyboard-manager.c | |
| parent | a279b02b4d563d2300ccb588e5969c7dfac8108e (diff) | |
| parent | 6e61d207a2088479f5bb12ce4edb1d2886c40b53 (diff) | |
| download | mate-settings-daemon-12dcf19aa5f51901053c273cd7f5c17ce85e909d.tar.bz2 mate-settings-daemon-12dcf19aa5f51901053c273cd7f5c17ce85e909d.tar.xz | |
Merge pull request #29 from jasmineaura/develop
Fix #23, and some cleanups
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 |