commit 779ce88fbd3f977112bc77ccb028b0ace762105e
author Gerd Hoffmann <kraxel@redhat.com> Tue Feb 17 10:41:08 2015 +0100
committer Gerd Hoffmann <kraxel@redhat.com> Wed Apr 22 13:21:16 2015 +0200
tree 3d913e151e1c41be977928b6dfc4de603cd99986
parent f8c223f69ac58488ea830597281b7ddd33037c4c

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 <kraxel@redhat.com>

ui/gtk.c

diff --git a/ui/gtk.c b/ui/gtk.c
index c8d30fe..7180066 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -1730,17 +1730,7 @@
                               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;