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 /libslab | |
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 'libslab')
-rw-r--r-- | libslab/app-shell.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/libslab/app-shell.c b/libslab/app-shell.c index 8a09ec08..45e6feae 100644 --- a/libslab/app-shell.c +++ b/libslab/app-shell.c @@ -26,9 +26,6 @@ #include <gio/gio.h> #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> -#if GTK_CHECK_VERSION (3, 0, 0) -#include <gdk/gdkkeysyms-compat.h> -#endif #include <sys/types.h> #include <sys/stat.h> #include <string.h> @@ -198,7 +195,7 @@ launch_selected_app (AppShellData * app_data) static gboolean main_keypress_callback (GtkWidget * widget, GdkEventKey * event, AppShellData * app_data) { - if (event->keyval == GDK_Return) + if (event->keyval == GDK_KEY_Return) { SlabSection *section = SLAB_SECTION (app_data->filter_section); NldSearchBar *search_bar; @@ -214,9 +211,9 @@ main_keypress_callback (GtkWidget * widget, GdkEventKey * event, AppShellData * } /* quit on ESC or Ctl-W or Ctl-Q */ - if (event->keyval == GDK_Escape || - ((event->keyval == GDK_w || event->keyval == GDK_W) && (event->state & GDK_CONTROL_MASK)) || - ((event->keyval == GDK_q || event->keyval == GDK_Q) && (event->state & GDK_CONTROL_MASK))) + if (event->keyval == GDK_KEY_Escape || + ((event->keyval == GDK_KEY_w || event->keyval == GDK_KEY_W) && (event->state & GDK_CONTROL_MASK)) || + ((event->keyval == GDK_KEY_q || event->keyval == GDK_KEY_Q) && (event->state & GDK_CONTROL_MASK))) { if (app_data->exit_on_close) gtk_main_quit (); |