summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Venhoda <lvenhoda@redhat.com>2016-01-02 17:07:52 +0100
committerFabiano FidĂȘncio <fidencio@redhat.com>2016-01-05 21:28:44 +0100
commit143a21cf1789ce673aee9ec7e0ee9110ec38f879 (patch)
treeaadb05d1a3f9a758bd81f8d8cd89093f91bd58a4
parente75d031bfe904bed1f62c72cf1dfa7de53646f6e (diff)
virt-viewer-display-vnc: Set guest name when using VNC
If it's not already set, set guest name field in virt-viewer-app when using VNC. Wait for VNC to be initialized (virt_viewer_display_vnc_initialized()). In this callback get field guest name from app and check whether it was already set before (FE from libvirt). If not, set the guest name to name provided by VNC from vnc_display_get_name(). This fill fix issue in remote-viewer: Guest name is Unknown when using VNC. (cherry picked from commit 772698a8a6e34c0b5051a3519f9284313426c1ca)
-rw-r--r--src/virt-viewer-display-vnc.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/virt-viewer-display-vnc.c b/src/virt-viewer-display-vnc.c
index 4b7243b..f477354 100644
--- a/src/virt-viewer-display-vnc.c
+++ b/src/virt-viewer-display-vnc.c
@@ -116,8 +116,22 @@ static void
virt_viewer_display_vnc_initialized(VncDisplay *vnc G_GNUC_UNUSED,
VirtViewerDisplay *display)
{
+ gchar *name = NULL;
+ VirtViewerSession *session = virt_viewer_display_get_session(display);
+ VirtViewerApp *app = virt_viewer_session_get_app(session);
+
+ g_object_get(app, "guest-name", &name, NULL);
+ if (name == NULL || *name == '\0') {
+ const gchar * vnc_name = vnc_display_get_name(vnc);
+ if (vnc_name != NULL) {
+ g_object_set(app, "guest-name", vnc_name, NULL);
+ }
+ }
+
virt_viewer_display_set_show_hint(display,
VIRT_VIEWER_DISPLAY_SHOW_HINT_READY, TRUE);
+
+ g_free(name);
}
static void