summaryrefslogtreecommitdiff
path: root/src/utilities/key.vala
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2018-12-21 22:57:46 +0100
committerJörg Frings-Fürst <debian@jff.email>2018-12-21 22:57:46 +0100
commitcda2ea1ef21e37a3d739b2241a6dcc709ee448da (patch)
tree070a8537d9bc4f77ad1bfa9135113fecf7179ecf /src/utilities/key.vala
parent2ac2ca1077001bfd616e6b8bdf39d42952fe1bf0 (diff)
parentda59fdb19b8e41f2a6443a9f41189f9a045cd94f (diff)
Merge branch 'release/debian/0.7.2-1'debian/0.7.2-1
Diffstat (limited to 'src/utilities/key.vala')
-rw-r--r--src/utilities/key.vala37
1 files changed, 22 insertions, 15 deletions
diff --git a/src/utilities/key.vala b/src/utilities/key.vala
index 93e18b5..c831b99 100644
--- a/src/utilities/key.vala
+++ b/src/utilities/key.vala
@@ -1,18 +1,24 @@
/////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2011-2017 by Simon Schneegans
+// Copyright 2011-2018 Simon Schneegans
//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or (at
-// your option) any later version.
-//
-// This program is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <http://www.gnu.org/licenses/>.
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
/////////////////////////////////////////////////////////////////////////
namespace GnomePie {
@@ -141,8 +147,9 @@ public class Key : GLib.Object {
/// Helper method returning currently hold down modifier keys.
/////////////////////////////////////////////////////////////////////
- private Gdk.ModifierType get_modifiers() {
- return (Gdk.ModifierType)Gdk.Keymap.get_default().get_modifier_state();
+ public static Gdk.ModifierType get_modifiers() {
+ return (Gdk.ModifierType)Gdk.Keymap.get_for_display(
+ Gdk.Display.get_default()).get_modifier_state();
}
/////////////////////////////////////////////////////////////////////