gtk: two bugfixes for 2.2.
-----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABAgAGBQJUbuwFAAoJEEy22O7T6HE49A8QANERRWP6syA4e5w8964ckqOu DcRX96xc2Y4ojwV3MgYjCcEUCspLFt78hR54cOgAAq0SET07/SaLc6hig2rqxRWX NZVvE50zLGeCHqcwSfxcCX7GcG0TuEpl3LG4MEY77AJ8BX7oBeMXC/pqRTrX9FBR yhYiAL3nww6bCKhvgB6LLkMMeJCligxHHdXPC3nl9SzGjjnHzgEhTiJWpTOYwKAs y/B97f+zX303su1PaJGyJWC5rYbfDntMZ1CUkhHjv4cZNFOY40t3mAr4NeO0ltbg 3F4cTtmNwDDgCfn5EeEkJ7fpKxX1g7snHkd7oJ3oJNjw1zUoZktToGn1Iegmawpj U917E72kUOPJqEpifYTuDkHGxotLNHqd42RVDYzfQZYTDZcvsWPKpxPdL8w7LEbA ebl6FW0RWpjd5P+LO5f2DHep1E2YEFcd4cO2fDDfHOoQLa5UaNe8oT8YNQxO3nAa zQHefQMj+vOgpRG316tACxas4vlwoeIsLdeGqYJ1RY3E2qFMxkVGJrrsmn9cYPJg KjqfCqEHvbiK5mqgRV4pC6uRZjhU1VAa7Xi+wYD+PjFvETL/C+c8V4qTyCwXM4Uy QusC4NFhYxIpbu1DEN2hYQonzyZCgBibKeQEvaxfnBF/+MuqNLWnjPJ+CbLDe2lF GWAQFwjl+yK2Kihw76F1 =K1ua -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/kraxel/tags/pull-gtk-20141121-1' into staging gtk: two bugfixes for 2.2. # gpg: Signature made Fri 21 Nov 2014 07:38:45 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-20141121-1: gtk: Don't crash if -nodefaults gtk: fix possible memory leak about local_err Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
a00c117338
17
ui/gtk.c
17
ui/gtk.c
|
@ -1666,10 +1666,9 @@ static GSList *gd_vc_gfx_init(GtkDisplayState *s, VirtualConsole *vc,
|
||||||
QemuConsole *con, int idx,
|
QemuConsole *con, int idx,
|
||||||
GSList *group, GtkWidget *view_menu)
|
GSList *group, GtkWidget *view_menu)
|
||||||
{
|
{
|
||||||
Error *local_err = NULL;
|
|
||||||
Object *obj;
|
Object *obj;
|
||||||
|
|
||||||
obj = object_property_get_link(OBJECT(con), "device", &local_err);
|
obj = object_property_get_link(OBJECT(con), "device", NULL);
|
||||||
if (obj) {
|
if (obj) {
|
||||||
vc->label = g_strdup_printf("%s", object_get_typename(obj));
|
vc->label = g_strdup_printf("%s", object_get_typename(obj));
|
||||||
} else {
|
} else {
|
||||||
|
@ -1910,15 +1909,17 @@ void gtk_display_init(DisplayState *ds, bool full_screen, bool grab_on_hover)
|
||||||
#ifdef VTE_RESIZE_HACK
|
#ifdef VTE_RESIZE_HACK
|
||||||
{
|
{
|
||||||
VirtualConsole *cur = gd_vc_find_current(s);
|
VirtualConsole *cur = gd_vc_find_current(s);
|
||||||
int i;
|
if (cur) {
|
||||||
|
int i;
|
||||||
|
|
||||||
for (i = 0; i < s->nb_vcs; i++) {
|
for (i = 0; i < s->nb_vcs; i++) {
|
||||||
VirtualConsole *vc = &s->vc[i];
|
VirtualConsole *vc = &s->vc[i];
|
||||||
if (vc && vc->type == GD_VC_VTE && vc != cur) {
|
if (vc && vc->type == GD_VC_VTE && vc != cur) {
|
||||||
gtk_widget_hide(vc->vte.terminal);
|
gtk_widget_hide(vc->vte.terminal);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
gd_update_windowsize(cur);
|
||||||
}
|
}
|
||||||
gd_update_windowsize(cur);
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue