|
 |
4a6991 |
From 835a81d588648be09c79966cf99e5adba7a555bb Mon Sep 17 00:00:00 2001
|
|
|
4a6991 |
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@gmail.com>
|
|
|
4a6991 |
Date: Fri, 2 Aug 2013 16:53:18 +0200
|
|
|
4a6991 |
Subject: [PATCH] spice: show an error dialog if password is invalid
|
|
|
4a6991 |
|
|
|
4a6991 |
Error message should show up when input the wrong password for spice
|
|
|
4a6991 |
guests as vnc guests.
|
|
|
4a6991 |
|
|
|
4a6991 |
https://bugzilla.redhat.com/show_bug.cgi?id=990883
|
|
|
4a6991 |
(cherry picked from commit 62f12d4c15333d25e73584dc9e128e201b1a92e2)
|
|
|
4a6991 |
---
|
|
|
4a6991 |
src/virt-viewer-session-spice.c | 7 +++++++
|
|
|
4a6991 |
1 file changed, 7 insertions(+)
|
|
|
4a6991 |
|
|
|
4a6991 |
diff --git a/src/virt-viewer-session-spice.c b/src/virt-viewer-session-spice.c
|
|
|
4a6991 |
index 4c52b47..2d59db2 100644
|
|
|
4a6991 |
--- a/src/virt-viewer-session-spice.c
|
|
|
4a6991 |
+++ b/src/virt-viewer-session-spice.c
|
|
|
4a6991 |
@@ -53,6 +53,7 @@ struct _VirtViewerSessionSpicePrivate {
|
|
|
4a6991 |
int channel_count;
|
|
|
4a6991 |
int usbredir_channel_count;
|
|
|
4a6991 |
gboolean has_sw_smartcard_reader;
|
|
|
4a6991 |
+ guint pass_try;
|
|
|
4a6991 |
};
|
|
|
4a6991 |
|
|
|
4a6991 |
#define VIRT_VIEWER_SESSION_SPICE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), VIRT_VIEWER_TYPE_SESSION_SPICE, VirtViewerSessionSpicePrivate))
|
|
|
4a6991 |
@@ -490,6 +491,12 @@ virt_viewer_session_spice_main_channel_event(SpiceChannel *channel G_GNUC_UNUSED
|
|
|
4a6991 |
break;
|
|
|
4a6991 |
case SPICE_CHANNEL_ERROR_AUTH:
|
|
|
4a6991 |
DEBUG_LOG("main channel: auth failure (wrong password?)");
|
|
|
4a6991 |
+
|
|
|
4a6991 |
+ if (self->priv->pass_try > 0)
|
|
|
4a6991 |
+ g_signal_emit_by_name(session, "session-auth-failed",
|
|
|
4a6991 |
+ _("invalid password"));
|
|
|
4a6991 |
+ self->priv->pass_try++;
|
|
|
4a6991 |
+
|
|
|
4a6991 |
int ret = virt_viewer_auth_collect_credentials(self->priv->main_window,
|
|
|
4a6991 |
"SPICE",
|
|
|
4a6991 |
NULL,
|