summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlberts Muktupāvels <alberts.muktupavels@gmail.com>2017-07-04 11:23:30 +0300
committerAlberts Muktupāvels <alberts.muktupavels@gmail.com>2017-07-04 11:23:30 +0300
commit1de8fdb4804b5e28965d454a642c9eab2bf5636c (patch)
treecdc15d42055ec6ad85f443ce777ffb4231a222ef
parent660a48b8194215787467fe58f67a88f91e9502bb (diff)
downloadmetacity-1de8fdb4804b5e28965d454a642c9eab2bf5636c.tar.gz
keybindings: fix shortcuts regression
Commit b9cfaa8803fa019b3a1502b067802f2434b6e737 removed meta_display_screen_for_xwindow function. It was supposed to be replaced with display->screen... https://bugzilla.gnome.org/show_bug.cgi?id=784500
-rw-r--r--src/core/keybindings.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index 50e70e58..6a1d144b 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -1262,11 +1262,7 @@ meta_display_process_key_event (MetaDisplay *display,
if (all_bindings_disabled)
return;
- /* if key event was on root window, we have a shortcut */
- screen = meta_display_screen_for_root (display, event->xkey.window);
-
- if (screen == NULL)
- return; /* event window is destroyed */
+ screen = display->screen;
/* ignore key events on popup menus and such. */
if (meta_ui_window_is_widget (screen->ui, event->xany.window))