summaryrefslogtreecommitdiffstats
path: root/src/virt-viewer-session-spice.c
diff options
context:
space:
mode:
authorFabiano FidĂȘncio <fidencio@redhat.com>2014-09-23 16:58:14 +0200
committerFabiano FidĂȘncio <fidencio@redhat.com>2014-09-26 16:30:43 +0200
commitec5a66146924c5b5dcfc6ea7e4eaa8857165981d (patch)
tree17cfed95e8508f5092c7c42d1c1ae1636bcdd9fc /src/virt-viewer-session-spice.c
parent141d69b7f523f1ecc3c328b43e4a54f9cbfb5eee (diff)
downloadvirt-viewer-ec5a66146924c5b5dcfc6ea7e4eaa8857165981d.tar.gz
virt-viewer-ec5a66146924c5b5dcfc6ea7e4eaa8857165981d.tar.xz
virt-viewer-ec5a66146924c5b5dcfc6ea7e4eaa8857165981d.zip
Let the user cancel the SPICE auth dialog
virt_viewer_auth_collect_credentials() was recently changed to return a boolean instead of an integer (2561c171). This change introduced a regression in the authentication dialog behavior, making it impossible for the user to cancel.
Diffstat (limited to 'src/virt-viewer-session-spice.c')
-rw-r--r--src/virt-viewer-session-spice.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/virt-viewer-session-spice.c b/src/virt-viewer-session-spice.c
index b856e78..885399c 100644
--- a/src/virt-viewer-session-spice.c
+++ b/src/virt-viewer-session-spice.c
@@ -482,7 +482,7 @@ virt_viewer_session_spice_main_channel_event(SpiceChannel *channel G_GNUC_UNUSED
{
VirtViewerSessionSpice *self = VIRT_VIEWER_SESSION_SPICE(session);
gchar *password = NULL, *user = NULL;
- int ret;
+ gboolean ret;
g_return_if_fail(self != NULL);
@@ -513,7 +513,7 @@ virt_viewer_session_spice_main_channel_event(SpiceChannel *channel G_GNUC_UNUSED
"SPICE",
NULL,
NULL, &password);
- if (ret < 0) {
+ if (!ret) {
g_signal_emit_by_name(session, "session-cancelled");
} else {
gboolean openfd;
@@ -542,7 +542,7 @@ virt_viewer_session_spice_main_channel_event(SpiceChannel *channel G_GNUC_UNUSED
ret = virt_viewer_auth_collect_credentials(self->priv->main_window,
"proxy", NULL,
&user, &password);
- if (ret < 0) {
+ if (!ret) {
g_signal_emit_by_name(session, "session-cancelled");
} else {
spice_uri_set_user(proxy, user);