wp/xed
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

drop gdkkeysyms-compat usage, use modern key names

Browse Source
This commit is contained in:
Monsta
2015-08-03 18:04:03 +03:00
parent 121e7b4f8a
commit 79c3e28490
8 changed files with 57 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/filebrowser/pluma-file-browser-view.c
View File

@@ -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;

18
plugins/filebrowser/pluma-file-browser-widget.c
View File

@@ -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);

5
plugins/taglist/pluma-taglist-plugin-panel.c
View File

@@ -43,9 +43,6 @@
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#if GTK_CHECK_VERSION (3, 0, 0)
#include <gdk/gdkkeysyms-compat.h>
#endif
#include <glib/gi18n.h>
#define PLUMA_TAGLIST_PLUGIN_PANEL_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), \
@@ -277,7 +274,7 @@ tag_list_key_press_event_cb (GtkTreeView *tag_list,
grab_focus = (event->state & GDK_CONTROL_MASK) != 0;
if (event->keyval == GDK_Return)
if (event->keyval == GDK_KEY_Return)
{
GtkTreeModel *model;
GtkTreeSelection *selection;