Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20160118-1' into staging
commit46188349ad7e23abef0e453d2b0406985f6552a1
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 18 Jan 2016 16:00:47 +0000 (18 16:00 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 18 Jan 2016 16:00:47 +0000 (18 16:00 +0000)
tree11045982bbdc1bac794ff8a9387f38d1f3e91326
parent4aaddc2976bff1918edcd53900b647dde473dd4d
parentc62e90af8c2e8b1a89d973963db2bb817702bf42
Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20160118-1' into staging

ui: misc small gtk/spice/vnc patches.

# gpg: Signature made Mon 18 Jan 2016 15:52:13 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-ui-20160118-1:
  vnc: fix tls-creds error message
  Fix corner-case when using VNC+SASL+SPICE
  vnc: clear vs->tlscreds after unparenting it
  gtk: implement set_echo

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