diff options
| author | Monsta <[email protected]> | 2015-08-03 18:04:03 +0300 |
|---|---|---|
| committer | Monsta <[email protected]> | 2015-08-03 18:04:03 +0300 |
| commit | 79c3e2849004a5c81a0b0bc25fb9dc0e1ce8a781 (patch) | |
| tree | a65addd96617d0b92b05a8f6d7c4b0d44b88d0de /plugins/filebrowser | |
| parent | 121e7b4f8a9a3b0571286929fbc504988561d148 (diff) | |
| download | pluma-79c3e2849004a5c81a0b0bc25fb9dc0e1ce8a781.tar.bz2 pluma-79c3e2849004a5c81a0b0bc25fb9dc0e1ce8a781.tar.xz | |
drop gdkkeysyms-compat usage, use modern key names
Diffstat (limited to 'plugins/filebrowser')
| -rw-r--r-- | plugins/filebrowser/pluma-file-browser-view.c | 11 | ||||
| -rw-r--r-- | plugins/filebrowser/pluma-file-browser-widget.c | 18 |
2 files changed, 12 insertions, 17 deletions
diff --git a/plugins/filebrowser/pluma-file-browser-view.c b/plugins/filebrowser/pluma-file-browser-view.c index bf8a11a1..6b52b0c9 100644 --- a/plugins/filebrowser/pluma-file-browser-view.c +++ b/plugins/filebrowser/pluma-file-browser-view.c @@ -24,9 +24,6 @@ #include <pluma/pluma-plugin.h> #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> -#if GTK_CHECK_VERSION (3, 0, 0) -#include <gdk/gdkkeysyms-compat.h> -#endif #include "pluma-file-browser-store.h" #include "pluma-file-bookmarks-store.h" @@ -637,7 +634,7 @@ key_press_event (GtkWidget *widget, modifiers = gtk_accelerator_get_default_mod_mask (); switch (event->keyval) { - case GDK_space: + case GDK_KEY_space: if (event->state & GDK_CONTROL_MASK) { handled = FALSE; break; @@ -651,13 +648,13 @@ key_press_event (GtkWidget *widget, handled = TRUE; break; - case GDK_Return: - case GDK_KP_Enter: + case GDK_KEY_Return: + case GDK_KEY_KP_Enter: activate_selected_items (view); handled = TRUE; break; - case GDK_h: + case GDK_KEY_h: if ((event->state & modifiers) == GDK_CONTROL_MASK) { toggle_hidden_filter (view); handled = TRUE; diff --git a/plugins/filebrowser/pluma-file-browser-widget.c b/plugins/filebrowser/pluma-file-browser-widget.c index 5e975d9a..f7ec52d4 100644 --- a/plugins/filebrowser/pluma-file-browser-widget.c +++ b/plugins/filebrowser/pluma-file-browser-widget.c @@ -30,9 +30,7 @@ #include <glib/gi18n-lib.h> #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> -#if GTK_CHECK_VERSION (3, 0, 0) -#include <gdk/gdkkeysyms-compat.h> -#endif + #include <pluma/pluma-utils.h> #include <pluma/pluma-plugin.h> @@ -2756,7 +2754,7 @@ do_change_directory (PlumaFileBrowserWidget * obj, if ((event->state & (~GDK_CONTROL_MASK & ~GDK_SHIFT_MASK & ~GDK_MOD1_MASK)) == - event->state && event->keyval == GDK_BackSpace) + event->state && event->keyval == GDK_KEY_BackSpace) action = gtk_action_group_get_action (obj->priv-> action_group_sensitive, "DirectoryPrevious"); @@ -2765,17 +2763,17 @@ do_change_directory (PlumaFileBrowserWidget * obj, return FALSE; switch (event->keyval) { - case GDK_Left: + case GDK_KEY_Left: action = gtk_action_group_get_action (obj->priv-> action_group_sensitive, "DirectoryPrevious"); break; - case GDK_Right: + case GDK_KEY_Right: action = gtk_action_group_get_action (obj->priv-> action_group_sensitive, "DirectoryNext"); break; - case GDK_Up: + case GDK_KEY_Up: action = gtk_action_group_get_action (obj->priv-> action_group, "DirectoryUp"); @@ -2808,8 +2806,8 @@ on_treeview_key_press_event (PlumaFileBrowserView * treeview, modifiers = gtk_accelerator_get_default_mod_mask (); - if (event->keyval == GDK_Delete - || event->keyval == GDK_KP_Delete) { + if (event->keyval == GDK_KEY_Delete + || event->keyval == GDK_KEY_KP_Delete) { if ((event->state & modifiers) == GDK_SHIFT_MASK) { if (obj->priv->enable_delete) { @@ -2822,7 +2820,7 @@ on_treeview_key_press_event (PlumaFileBrowserView * treeview, } } - if ((event->keyval == GDK_F2) + if ((event->keyval == GDK_KEY_F2) && (event->state & modifiers) == 0) { rename_selected_file (obj); |