diff options
| author | Stefano Karapetsas <[email protected]> | 2012-12-15 12:33:17 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2012-12-15 12:33:17 -0800 |
| commit | 85c5ae14d75e3413b8f3f3aa38205ea852dcb20d (patch) | |
| tree | 4750b8d23dfcb17aea6cbc62c7e1c788a6976a7b /plugins/common | |
| parent | 12dcf19aa5f51901053c273cd7f5c17ce85e909d (diff) | |
| parent | c6a6cbde72489a0055ba63341a153fe365058072 (diff) | |
| download | mate-settings-daemon-85c5ae14d75e3413b8f3f3aa38205ea852dcb20d.tar.bz2 mate-settings-daemon-85c5ae14d75e3413b8f3f3aa38205ea852dcb20d.tar.xz | |
Merge pull request #31 from jasmineaura/develop
background revised, various other fixes & improvements
Diffstat (limited to 'plugins/common')
| -rw-r--r-- | plugins/common/eggaccelerators.c | 18 | ||||
| -rw-r--r-- | plugins/common/msd-keygrab.c | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/plugins/common/eggaccelerators.c b/plugins/common/eggaccelerators.c index 448fb02..171a369 100644 --- a/plugins/common/eggaccelerators.c +++ b/plugins/common/eggaccelerators.c @@ -601,20 +601,20 @@ reload_modmap (GdkKeymap *keymap, mask = 0; for (j = 0; j < n_entries; ++j) { - if (keyvals[j] == GDK_Num_Lock) + if (keyvals[j] == GDK_KEY_Num_Lock) mask |= EGG_VIRTUAL_NUM_LOCK_MASK; - else if (keyvals[j] == GDK_Scroll_Lock) + else if (keyvals[j] == GDK_KEY_Scroll_Lock) mask |= EGG_VIRTUAL_SCROLL_LOCK_MASK; - else if (keyvals[j] == GDK_Meta_L || - keyvals[j] == GDK_Meta_R) + else if (keyvals[j] == GDK_KEY_Meta_L || + keyvals[j] == GDK_KEY_Meta_R) mask |= EGG_VIRTUAL_META_MASK; - else if (keyvals[j] == GDK_Hyper_L || - keyvals[j] == GDK_Hyper_R) + else if (keyvals[j] == GDK_KEY_Hyper_L || + keyvals[j] == GDK_KEY_Hyper_R) mask |= EGG_VIRTUAL_HYPER_MASK; - else if (keyvals[j] == GDK_Super_L || - keyvals[j] == GDK_Super_R) + else if (keyvals[j] == GDK_KEY_Super_L || + keyvals[j] == GDK_KEY_Super_R) mask |= EGG_VIRTUAL_SUPER_MASK; - else if (keyvals[j] == GDK_Mode_switch) + else if (keyvals[j] == GDK_KEY_Mode_switch) mask |= EGG_VIRTUAL_MODE_SWITCH_MASK; } diff --git a/plugins/common/msd-keygrab.c b/plugins/common/msd-keygrab.c index c096758..722656b 100644 --- a/plugins/common/msd-keygrab.c +++ b/plugins/common/msd-keygrab.c @@ -219,7 +219,7 @@ match_key (Key *key, XEvent *event) group = XkbGroupForCoreState (event->xkey.state); else #endif - group = (event->xkey.state & GDK_Mode_switch) ? 1 : 0; + 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, |