diff options
| author | Monsta <[email protected]> | 2015-08-03 17:25:22 +0300 |
|---|---|---|
| committer | Monsta <[email protected]> | 2015-08-03 17:25:22 +0300 |
| commit | 4a9a87bf8cd3b8c38ef5ccf09c80a533173e895f (patch) | |
| tree | 72a4818c46c2403e35380fd042b9099d3c8977f6 /capplets/keybindings/eggaccelerators.c | |
| parent | 6bc0f4e76eaf22758002af90bac5ecbdc4ade742 (diff) | |
| download | mate-control-center-4a9a87bf8cd3b8c38ef5ccf09c80a533173e895f.tar.bz2 mate-control-center-4a9a87bf8cd3b8c38ef5ccf09c80a533173e895f.tar.xz | |
drop gdkkeysyms-compat usage, use modern key names
Diffstat (limited to 'capplets/keybindings/eggaccelerators.c')
| -rw-r--r-- | capplets/keybindings/eggaccelerators.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/capplets/keybindings/eggaccelerators.c b/capplets/keybindings/eggaccelerators.c index c81c567e..03ffca71 100644 --- a/capplets/keybindings/eggaccelerators.c +++ b/capplets/keybindings/eggaccelerators.c @@ -26,10 +26,6 @@ #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> -#if GTK_CHECK_VERSION (3, 0, 0) -#include <gdk/gdkkeysyms-compat.h> -#endif - enum { EGG_MODMAP_ENTRY_SHIFT = 0, EGG_MODMAP_ENTRY_LOCK = 1, @@ -565,20 +561,20 @@ reload_modmap (GdkKeymap *keymap, mask = 0; for (j = 0; j < n_entries; ++j) { - if (keyvals[j] == GDK_Num_Lock) + if (keyvals[j] == GDK_KEY_Num_Lock) mask |= EGG_VIRTUAL_NUM_LOCK_MASK; - else if (keyvals[j] == GDK_Scroll_Lock) + else if (keyvals[j] == GDK_KEY_Scroll_Lock) mask |= EGG_VIRTUAL_SCROLL_LOCK_MASK; - else if (keyvals[j] == GDK_Meta_L || - keyvals[j] == GDK_Meta_R) + else if (keyvals[j] == GDK_KEY_Meta_L || + keyvals[j] == GDK_KEY_Meta_R) mask |= EGG_VIRTUAL_META_MASK; - else if (keyvals[j] == GDK_Hyper_L || - keyvals[j] == GDK_Hyper_R) + else if (keyvals[j] == GDK_KEY_Hyper_L || + keyvals[j] == GDK_KEY_Hyper_R) mask |= EGG_VIRTUAL_HYPER_MASK; - else if (keyvals[j] == GDK_Super_L || - keyvals[j] == GDK_Super_R) + else if (keyvals[j] == GDK_KEY_Super_L || + keyvals[j] == GDK_KEY_Super_R) mask |= EGG_VIRTUAL_SUPER_MASK; - else if (keyvals[j] == GDK_Mode_switch) + else if (keyvals[j] == GDK_KEY_Mode_switch) mask |= EGG_VIRTUAL_MODE_SWITCH_MASK; } |