File virtview-reconnect-fix.patch of Package virt-viewer

Overview Repositories Revisions Requests Users Attributes Meta

File virtview-reconnect-fix.patch of Package virt-viewer (Revision e67d21aa476591455a04f1fc68fa6550)

Currently displaying revision e67d21aa476591455a04f1fc68fa6550 , Show latest

Subject: Fix re-connect after authentication failure
From: Daniel P. Berrange berrange@redhat.com Mon May 23 12:41:12 2011 +0100
Date: Mon May 23 12:41:12 2011 +0100:
Git: 6234a2e1f4f904a8ed8f625a7d8fe1705fe5478a

viewer->display will be non-NULL if we have already attempted a
connection. So, remove the check for it being NULL, and instead
skip the widget setup step.

Index: virt-viewer-0.3.1/src/viewer.c
===================================================================
--- virt-viewer-0.3.1.orig/src/viewer.c
+++ virt-viewer-0.3.1/src/viewer.c
@@ -899,18 +899,18 @@ static int viewer_activate(VirtViewer *v
 	int fd = -1;
 	int ret = -1;
 
-	g_return_val_if_fail(viewer->display == NULL, -1);
-
 	if (viewer->active)
 		goto cleanup;
 
-	if (!viewer_extract_connect_info(viewer, dom))
-		goto cleanup;
+	if (viewer->display == NULL) {
+		if (!viewer_extract_connect_info(viewer, dom))
+			goto cleanup;
 
-	if (viewer->gport)
-		viewer->pretty_address = g_strdup_printf("%s:%s", viewer->host, viewer->gport);
-	else
-		viewer->pretty_address = g_strdup_printf("%s:%s", viewer->host, viewer->unixsock);
+		if (viewer->gport)
+			viewer->pretty_address = g_strdup_printf("%s:%s", viewer->host, viewer->gport);
+		else
+			viewer->pretty_address = g_strdup_printf("%s:%s", viewer->host, viewer->unixsock);
+	}
 
 #if defined(HAVE_SOCKETPAIR) && defined(HAVE_FORK)
 	if (viewer->transport &&

Places

File virtview-reconnect-fix.patch of Package virt-viewer (Revision e67d21aa476591455a04f1fc68fa6550)

Places