From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46100) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wn28G-00015j-Gx for qemu-devel@nongnu.org; Wed, 21 May 2014 04:44:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wn288-0007DB-LY for qemu-devel@nongnu.org; Wed, 21 May 2014 04:44:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60815) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wn288-0007Cv-CC for qemu-devel@nongnu.org; Wed, 21 May 2014 04:44:08 -0400 From: Gerd Hoffmann Date: Wed, 21 May 2014 10:43:45 +0200 Message-Id: <1400661841-16031-10-git-send-email-kraxel@redhat.com> In-Reply-To: <1400661841-16031-1-git-send-email-kraxel@redhat.com> References: <1400661841-16031-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 09/25] gtk: use device type as label List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Anthony Liguori IMO useful than showing VGA for any graphic device even in case it is something completely different. Signed-off-by: Gerd Hoffmann --- ui/gtk.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/ui/gtk.c b/ui/gtk.c index 0756432..a8393dd 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -67,6 +67,7 @@ #include "x_keymap.h" #include "keymaps.h" #include "sysemu/char.h" +#include "qom/object.h" #define MAX_VCS 10 @@ -1457,6 +1458,15 @@ static GSList *gd_vc_gfx_init(GtkDisplayState *s, VirtualConsole *vc, QemuConsole *con, int idx, GSList *group, GtkWidget *view_menu) { + const char *label = "VGA"; + Error *local_err = NULL; + Object *obj; + + obj = object_property_get_link(OBJECT(con), "device", &local_err); + if (obj) { + label = object_get_typename(obj); + } + vc->s = s; vc->gfx.scale_x = 1.0; vc->gfx.scale_y = 1.0; @@ -1477,10 +1487,10 @@ static GSList *gd_vc_gfx_init(GtkDisplayState *s, VirtualConsole *vc, vc->type = GD_VC_GFX; vc->tab_item = vc->gfx.drawing_area; gtk_notebook_append_page(GTK_NOTEBOOK(s->notebook), - vc->tab_item, gtk_label_new("VGA")); + vc->tab_item, gtk_label_new(label)); gd_connect_vc_gfx_signals(vc); - group = gd_vc_menu_init(s, vc, "VGA", idx, group, view_menu); + group = gd_vc_menu_init(s, vc, label, idx, group, view_menu); vc->gfx.dcl.ops = &dcl_ops; vc->gfx.dcl.con = con; -- 1.8.3.1