pxcloud/virt-viewer
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/virt-viewer synced 2026-01-08 21:14:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Fix virt_viewer_app_activate return value"

Browse Source 
This reverts commit 3ce6df7c30. This
commit broke virt-viewer which expects this function to return -1
or 0 on error, and a positive value on success in
virt_viewer_initial_connect.
This commit is contained in:
Christophe Fergeau 2012-06-15 10:03:21 +02:00
parent 3ce6df7c30
commit 4b310b03e9
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/virt-viewer-app.c
View File

@ -846,18 +846,15 @@ virt_viewer_app_default_activate(VirtViewerApp *self)
#endif
if (fd >= 0) {
if (virt_viewer_session_open_fd(VIRT_VIEWER_SESSION(priv->session), fd))
return 0;
return virt_viewer_session_open_fd(VIRT_VIEWER_SESSION(priv->session), fd);
} else if (priv->guri) {
virt_viewer_app_trace(self, "Opening connection to display at %s\n", priv->guri);
if (virt_viewer_session_open_uri(VIRT_VIEWER_SESSION(priv->session), priv->guri))
return 0;
return virt_viewer_session_open_uri(VIRT_VIEWER_SESSION(priv->session), priv->guri);
} else {
virt_viewer_app_trace(self, "Opening direct TCP connection to display at %s:%s:%s\n",
priv->ghost, priv->gport, priv->gtlsport ? priv->gtlsport : "-1");
if (virt_viewer_session_open_host(VIRT_VIEWER_SESSION(priv->session),
priv->ghost, priv->gport, priv->gtlsport))
return 0;
return virt_viewer_session_open_host(VIRT_VIEWER_SESSION(priv->session),
priv->ghost, priv->gport, priv->gtlsport);
}
return -1;