Commit a00c1173 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 9c7074da b310a2a6

ui/gtk.c

+10 −9
Original line number Diff line number Diff line
@@ -1666,10 +1666,9 @@ static GSList *gd_vc_gfx_init(GtkDisplayState *s, VirtualConsole *vc, 
                              QemuConsole *con, int idx,

                              GSList *group, GtkWidget *view_menu)

{

    Error *local_err = NULL;

    Object *obj;



    obj = object_property_get_link(OBJECT(con), "device", &local_err);

    obj = object_property_get_link(OBJECT(con), "device", NULL);

    if (obj) {

        vc->label = g_strdup_printf("%s", object_get_typename(obj));

    } else {
@@ -1910,6 +1909,7 @@ void gtk_display_init(DisplayState *ds, bool full_screen, bool grab_on_hover) 
#ifdef VTE_RESIZE_HACK

    {

        VirtualConsole *cur = gd_vc_find_current(s);

        if (cur) {

            int i;



            for (i = 0; i < s->nb_vcs; i++) {
@@ -1920,6 +1920,7 @@ void gtk_display_init(DisplayState *ds, bool full_screen, bool grab_on_hover) 
            }

            gd_update_windowsize(cur);

        }

    }

#endif



    if (full_screen) {