summaryrefslogtreecommitdiff
path: root/plugins/common
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2014-02-20 22:07:44 +0100
committerStefano Karapetsas <[email protected]>2014-02-20 22:07:44 +0100
commitfef4447c314fdcbf72320bed68bd5eff130e471b (patch)
tree8b6ce5f648da100e47c3d9f09a0620c60da432eb /plugins/common
parent8b2f3e16982d40a1ea391d550b824f267707a1d5 (diff)
parent276d3e0577ca8e42e675ac47d636e466e1653e76 (diff)
downloadmate-settings-daemon-fef4447c314fdcbf72320bed68bd5eff130e471b.tar.bz2
mate-settings-daemon-fef4447c314fdcbf72320bed68bd5eff130e471b.tar.xz
Merge pull request #61 from dnk/master
gtk3: fix media keys
Diffstat (limited to 'plugins/common')
-rw-r--r--plugins/common/eggaccelerators.c2
-rw-r--r--plugins/common/msd-keygrab.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/common/eggaccelerators.c b/plugins/common/eggaccelerators.c
index 171a369..0b32887 100644
--- a/plugins/common/eggaccelerators.c
+++ b/plugins/common/eggaccelerators.c
@@ -387,7 +387,7 @@ egg_accelerator_parse_virtual (const gchar *accelerator,
GdkKeymapKey *keys;
gint n_keys, i, j;
- if (!gdk_keymap_get_entries_for_keyval (NULL, keyval, &keys, &n_keys)) {
+ if (!gdk_keymap_get_entries_for_keyval (gdk_keymap_get_default(), keyval, &keys, &n_keys)) {
bad_keyval = TRUE;
} else {
*accelerator_codes = g_new0 (guint, n_keys + 1);
diff --git a/plugins/common/msd-keygrab.c b/plugins/common/msd-keygrab.c
index 722656b..2a486fb 100644
--- a/plugins/common/msd-keygrab.c
+++ b/plugins/common/msd-keygrab.c
@@ -222,7 +222,7 @@ match_key (Key *key, XEvent *event)
group = (event->xkey.state & GDK_KEY_Mode_switch) ? 1 : 0;
/* Check if we find a keysym that matches our current state */
- if (gdk_keymap_translate_keyboard_state (NULL, event->xkey.keycode,
+ if (gdk_keymap_translate_keyboard_state (gdk_keymap_get_default(), event->xkey.keycode,
event->xkey.state, group,
&keyval, NULL, NULL, &consumed)) {
guint lower, upper;