tree 987695c48f50fe1a20747e115322ba1b578b7691
parent b76a0d5db25ad9f81346930230092fdf1e88a5a1
parent 2cb5d2a47c655331bcf0ab16bab8fe4701182c58
author Peter Maydell <peter.maydell@linaro.org> 1442322688 +0100
committer Peter Maydell <peter.maydell@linaro.org> 1442322688 +0100
mergetag object 2cb5d2a47c655331bcf0ab16bab8fe4701182c58
 type commit
 tag pull-gtk-20150915-1
 tagger Gerd Hoffmann <kraxel@redhat.com> 1442313296 +0200
 
 gtk: misc grab tweaks, locale fix.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJV9/R4AAoJEEy22O7T6HE4gPkP/R3+vDFsIf2uUl6R/XDFBvOc
 0wF9Ft+8I2XJxOGdLMm49m/tJoohYzi3EnOA7yeQa9b63C56DzMawaf30F2Si0X/
 lVv80HfmGsD0d/TZVuJxHswkSu+BiHnpq8pcefvGo19fb3niRa5fwpVHf6y8woWZ
 8QXdL9d89e+hHe1YRXbDleEGasCUk47bJEtKqi7h9qvcvSgGWRf+zGWHFWc0JH/Q
 5TPV40Yp9G6E8E5/9VxR3FCLnv4rxgRqtzPsZX+3M4w31HfFxLogC6LStoAFUwac
 RnQrLA/NW7PeQUx0Sct5Aqsaw2VhOwWp1NSTKjdXJFySxT7iCfKfYsNkpZynYT2U
 +ODjvuZMUT0tBWZUZINjLw0DXnGfRGc9prMvtqKGPZ5D+kfUaLR9zDbu/BwcnfYB
 LJ3LCqsA2IlyA+UnLqo7xnG5ba4ceyZpF6tpXhfBQAlf0l9Gw4wbCjBnaBxLO4Ib
 hKYKvryQNL/j+tcBU8/ImrVbdUHWljndvukjP/TOCX59UWarryS4oNPw1WVp3IBv
 CGNwgboq+QNZ2aIhXuOtDCJ3K/9F5AI9pX79nZ9jmxovCHpFnEa5zVBQ33xubyr0
 n4JzGC+CWM9vwhkhsm3huRyHbAjdDqSJ1FRuN8z+LHL6XMvhS9zhUmjgJVyGoe9M
 9jVVwrLxvL52DFYLPz5V
 =ANFa
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/kraxel/tags/pull-gtk-20150915-1' into staging

gtk: misc grab tweaks, locale fix.

# gpg: Signature made Tue 15 Sep 2015 11:35:36 BST 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-20150915-1:
  gtk: use setlocale() for LC_MESSAGES only
  gtk: don't grab input when entering fullscreen.
  gtk: set free_scale when setting zoom_fit
  gtk: trace input grab reason
  gtk: move gd_update_caption calls to gd_{grab,ungrab}_{pointer,keyboard}
  gtk: check for existing grabs in gd_grab_{pointer,keyboard}

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