summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMonsta <[email protected]>2015-08-03 16:21:33 +0300
committerMonsta <[email protected]>2015-08-03 16:21:33 +0300
commit5f8beda3a0b423deeb1e4a64f4d3c5fbad8005b2 (patch)
tree109023f844b9f809428fe8ce45e4b7ed19328dc7 /src
parent884fbf235d34f2f89fb690a6a8c6644ff6ef3723 (diff)
downloadmate-indicator-applet-5f8beda3a0b423deeb1e4a64f4d3c5fbad8005b2.tar.bz2
mate-indicator-applet-5f8beda3a0b423deeb1e4a64f4d3c5fbad8005b2.tar.xz
drop gdkkeysyms-compat usage, use modern key names
Diffstat (limited to 'src')
-rw-r--r--src/eggaccelerators.c22
1 files changed, 9 insertions, 13 deletions
diff --git a/src/eggaccelerators.c b/src/eggaccelerators.c
index 804615e..3038ce9 100644
--- a/src/eggaccelerators.c
+++ b/src/eggaccelerators.c
@@ -21,11 +21,7 @@
#include <string.h>
#include <gdk/gdkx.h>
-#if GTK_CHECK_VERSION(3,0,0)
-#include <gdk/gdkkeysyms-compat.h>
-#else
#include <gdk/gdkkeysyms.h>
-#endif
enum
{
@@ -582,20 +578,20 @@ reload_modmap (GdkKeymap *keymap,
j = 0;
while (j < n_entries)
{
- 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;
++j;