diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-05-13 13:39:38 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-05-13 13:39:38 +0100 |
| commit | 70f87e0f0aa04f764dabaeb3ed71ff195748076a (patch) | |
| tree | 83cb7d06228a15c50b9041a0be0ace3fd1c875cd /include | |
| parent | 14fccfa91ecac7af36ac03dc1c2bb9a1d7fbca26 (diff) | |
| parent | 6978dc4adcdf27722aa6f9e13f88a903b30a3f8d (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20160513-1' into staging
gtk/sdl build tweaks
fix gtk 3.20 warnings
gtk clipboard support
spice-gl monitor config support
fix coverity warnings
# gpg: Signature made Fri 13 May 2016 13:30:39 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-ui-20160513-1:
gtk: don't leak the GtkBorder with VTE 0.36
gtk: update grab code for gtk 3.20
spice: fix coverity complains
egl-helpers: fix possible resource leak
Changed malloc to g_malloc, free to g_free in ui/shader.c
spice/gl: add & use qemu_spice_gl_monitor_config
ui/gtk: copy to clipboard support
ui: gtk: Fix some deprecation warnings
ui: gtk: Fix a runtime warning on vte >= 0.37
configure: support vte-2.91
configure: report SDL version
configure: report GTK version
configure: add echo_version helper
configure: error on unknown --with-sdlabi value
configure: build SDL if only SDL2 available
ui: sdl2: Release grab before opening console window
ui: gtk: fix crash when terminal inner-border is NULL
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/ui/spice-display.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/ui/spice-display.h b/include/ui/spice-display.h index 30ccfe3dab..568b64a0f6 100644 --- a/include/ui/spice-display.h +++ b/include/ui/spice-display.h @@ -71,6 +71,7 @@ typedef struct QXLCookie { QXLRect area; int redraw; } render; + void *data; } u; } QXLCookie; |