[virt-tools-list] [virt-viewer: PATCH 1/3 v2] Let the user cancel the SPICE auth dialog

Fabiano Fidêncio fidencio at redhat.com
Tue Sep 23 18:41:26 UTC 2014


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, do not letting the
user cancel it.
---
v2: Fix typo in the short log
---

 src/virt-viewer-session-spice.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/virt-viewer-session-spice.c b/src/virt-viewer-session-spice.c
index 2323832..dd96fdf 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);
-- 
1.9.3




More information about the virt-tools-list mailing list