From 779ce88fbd3f977112bc77ccb028b0ace762105e Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Tue, 17 Feb 2015 10:41:08 +0100 Subject: console/gtk: add qemu_console_get_label Add a new function to get a nice label for a given QemuConsole. Drop the labeling code in gtk.c and use the new function instead. Signed-off-by: Gerd Hoffmann --- ui/gtk.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'ui/gtk.c') diff --git a/ui/gtk.c b/ui/gtk.c index c8d30fed79..7180066bde 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -1730,17 +1730,7 @@ static GSList *gd_vc_gfx_init(GtkDisplayState *s, VirtualConsole *vc, QemuConsole *con, int idx, GSList *group, GtkWidget *view_menu) { - Object *obj; - - obj = object_property_get_link(OBJECT(con), "device", NULL); - if (obj) { - vc->label = g_strdup_printf("%s", object_get_typename(obj)); - } else if (qemu_console_is_graphic(con)) { - vc->label = g_strdup_printf("VGA"); - } else { - vc->label = g_strdup_printf("vc%d", idx); - } - + vc->label = qemu_console_get_label(con); vc->s = s; vc->gfx.scale_x = 1.0; vc->gfx.scale_y = 1.0; -- cgit 1.4.1