From 9e2f9ea0643c18a7d8a499fc0391b7daf06abbd0 Mon Sep 17 00:00:00 2001 From: Marc-André Lureau Date: Thu, 13 Nov 2014 18:20:42 +0100 Subject: Simplify virt_viewer_initial_connect() - remove need for waitvm if the display server isn't yet started (note: this function might be untested, I am not sure relying on libvirt events is enough) --- src/virt-viewer.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/virt-viewer.c b/src/virt-viewer.c index 735ac72..1a64f84 100644 --- a/src/virt-viewer.c +++ b/src/virt-viewer.c @@ -685,18 +685,11 @@ virt_viewer_initial_connect(VirtViewerApp *app, GError **error) goto wait; } ret = virt_viewer_update_display(self, dom); - if (ret) + if (ret) { ret = VIRT_VIEWER_APP_CLASS(virt_viewer_parent_class)->initial_connect(app, &err); if (!ret) { - if (priv->waitvm) { - virt_viewer_app_show_status(app, _("Waiting for guest domain to start server")); - goto wait; - } else { - g_set_error_literal(&err, VIRT_VIEWER_ERROR, VIRT_VIEWER_ERROR_FAILED, - _("Failed to activate viewer")); - g_debug("%s", err->message); - goto cleanup; - } + virt_viewer_app_show_status(app, _("Waiting for guest domain to start server")); + goto wait; } wait: -- cgit