summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonsta <[email protected]>2015-08-03 16:38:53 +0300
committerMonsta <[email protected]>2015-08-03 16:38:53 +0300
commita1f2f163874ad9eed581c206f849e95abd046f84 (patch)
treef157872e71eb2b1dfe791dea0e155ae2f535fed3
parentdde6b719b092449f54a2383c7b4e783e7778b303 (diff)
downloadmate-netbook-a1f2f163874ad9eed581c206f849e95abd046f84.tar.bz2
mate-netbook-a1f2f163874ad9eed581c206f849e95abd046f84.tar.xz
maximus: drop gdkkeysyms-compat usage, use modern key names
-rw-r--r--maximus/eggaccelerators.c21
1 files changed, 9 insertions, 12 deletions
diff --git a/maximus/eggaccelerators.c b/maximus/eggaccelerators.c
index d914811..3038ce9 100644
--- a/maximus/eggaccelerators.c
+++ b/maximus/eggaccelerators.c
@@ -22,9 +22,6 @@
#include <string.h>
#include <gdk/gdkx.h>
#include <gdk/gdkkeysyms.h>
-#if GTK_CHECK_VERSION (3, 0, 0)
-#include <gdk/gdkkeysyms-compat.h>
-#endif
enum
{
@@ -581,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;