From 42c1285ead5fa6c57c82c87bb50dbeac3ce18400 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Sat, 22 Dec 2012 22:21:47 -0500
Subject: [PATCH] messageTray: Remove code for ignoring num lock / scroll lock

Clutter now ignores these masks, so we can remove code that depends
on this.

https://bugzilla.gnome.org/show_bug.cgi?id=691731
---
 configure.ac         | 2 +-
 js/ui/messageTray.js | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 65ae03bb6..c8600f052 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,7 +62,7 @@ fi
 
 AM_CONDITIONAL(BUILD_RECORDER, $build_recorder)
 
-CLUTTER_MIN_VERSION=1.11.11
+CLUTTER_MIN_VERSION=1.13.4
 GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
 GJS_MIN_VERSION=1.35.4
 MUTTER_MIN_VERSION=3.7.4
diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index 517e7a979..246bbf653 100644
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -1630,10 +1630,7 @@ const MessageTray = new Lang.Class({
     },
 
     _onNotificationKeyRelease: function(actor, event) {
-        let ignoredModifiers = global.display.get_ignored_modifier_mask();
-        let modifierState = event.get_state() & ~ignoredModifiers;
-
-        if (event.get_key_symbol() == Clutter.KEY_Escape && modifierState == 0) {
+        if (event.get_key_symbol() == Clutter.KEY_Escape && event.get_state() == 0) {
             this._closeNotification();
             return true;
         }