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

[Jonathon Jongsma]

ACK

On Wed, 2014-09-24 at 13:49 +0200, Fabiano Fidêncio wrote:
> 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.
> ---
> v2:
> - Fix typo in the short log
> v3:
> - Improve the commit message
> ---
>  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);