From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 4 Nov 2014 15:00:17 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-gtk-20141104-2' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1bc8dae31baa8b02a1b8e70c3244232e03bbb3b2;p=qemu.git

Merge remote-tracking branch 'remotes/kraxel/tags/pull-gtk-20141104-2' into staging

gtk: fix fullscreen with gtk3, fix build with older gtk2 versions.

# gpg: Signature made Tue 04 Nov 2014 13:42:09 GMT using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-gtk-20141104-2:
  gtk: add GDK_KEY_pause #define
  gtk: Hide the menubar when in fullscreen mode (lp 1294898)
  gtk: Install vc accelerators on parent window
  gtk: Install fullscreen accelerator on toplevel window
  gtk: Grab accel_group from GtkDisplayState

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

1bc8dae31baa8b02a1b8e70c3244232e03bbb3b2