[gtk+/gtk-3-20] wayland: Leave existing mods on map_virtual_modifiers

[Rui Matos <rtcm src gnome org>]

commit 60ba261ed6b5778486f5aac799f1439327e3d526
Author: Rui Matos <tiagomatos gmail com>
Date:   Tue Apr 19 21:03:45 2016 +0200

    wayland: Leave existing mods on map_virtual_modifiers
    
    map_virtual_modifiers() is supposed to add the necessary virtual mods
    but otherwise leave the mods that are passed in.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=765270

 gdk/wayland/gdkkeys-wayland.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/gdk/wayland/gdkkeys-wayland.c b/gdk/wayland/gdkkeys-wayland.c
index 32b4809..229eedb 100644
--- a/gdk/wayland/gdkkeys-wayland.c
+++ b/gdk/wayland/gdkkeys-wayland.c
@@ -421,7 +421,7 @@ gdk_wayland_keymap_map_virtual_modifiers (GdkKeymap       *keymap,
   mapped = xkb_state_serialize_mods (xkb_state, XKB_STATE_MODS_EFFECTIVE);
   if ((mapped & mods & 0xff) != 0)
     ret = FALSE;
-  *state = get_gdk_modifiers (xkb_keymap, mapped);
+  *state |= get_gdk_modifiers (xkb_keymap, mapped);
 
   xkb_state_unref (xkb_state);