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/eggcellrendererkeys.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/eggcellrendererkeys.c')
-rw-r--r-- | capplets/keybindings/eggcellrendererkeys.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/capplets/keybindings/eggcellrendererkeys.c b/capplets/keybindings/eggcellrendererkeys.c index 22ea7a79..11d89a39 100644 --- a/capplets/keybindings/eggcellrendererkeys.c +++ b/capplets/keybindings/eggcellrendererkeys.c @@ -3,9 +3,6 @@ #include <gtk/gtk.h> #include <gdk/gdkx.h> #include <gdk/gdkkeysyms.h> -#if GTK_CHECK_VERSION (3, 0, 0) -#include <gdk/gdkkeysyms-compat.h> -#endif #include "eggcellrendererkeys.h" #include "eggaccelerators.h" @@ -402,9 +399,9 @@ static gboolean grab_key_callback(GtkWidget* widget, GdkEventKey* event, void* d upper = event->keyval; accel_keyval = gdk_keyval_to_lower(upper); - if (accel_keyval == GDK_ISO_Left_Tab) + if (accel_keyval == GDK_KEY_ISO_Left_Tab) { - accel_keyval = GDK_Tab; + accel_keyval = GDK_KEY_Tab; } /* Put shift back if it changed the case of the key, not otherwise. */ @@ -441,13 +438,13 @@ static gboolean grab_key_callback(GtkWidget* widget, GdkEventKey* event, void* d g_assert_not_reached(); } - if (accel_mods == 0 && accel_keyval == GDK_Escape) + if (accel_mods == 0 && accel_keyval == GDK_KEY_Escape) { goto out; /* cancel */ } /* clear the accelerator on Backspace */ - if (accel_mods == 0 && accel_keyval == GDK_BackSpace) + if (accel_mods == 0 && accel_keyval == GDK_KEY_BackSpace) { cleared = TRUE; goto out; |