|
 |
140d58 |
From 98de755b5be6e76570782755ff026061310bec19 Mon Sep 17 00:00:00 2001
|
|
|
140d58 |
From: Victor Toso <me@victortoso.com>
|
|
|
140d58 |
Date: Tue, 6 Jun 2017 14:05:32 +0200
|
|
|
140d58 |
Subject: [PATCH] vnc: do not show error on cancel/close of auth dialog
|
|
|
140d58 |
|
|
|
140d58 |
Mainly a kiosk mode issue, similar to the spice fix in 6480e52f62b.
|
|
|
140d58 |
|
|
|
140d58 |
This patch saves the cancel/close state of auth dialog from
|
|
|
140d58 |
virt_viewer_auth_collect_credentials() in order to avoid an error
|
|
|
140d58 |
dialog to pop up to user in kiosk mode.
|
|
|
140d58 |
|
|
|
140d58 |
This happens due the fact that we call virt_viewer_app_disconnected()
|
|
|
140d58 |
twice:
|
|
|
140d58 |
- One with "session-cancelled" which is correct and well handled;
|
|
|
140d58 |
- The other with "session-disconnected" which is misleading as there
|
|
|
140d58 |
was no connection at this time. This will trigger the error dialog
|
|
|
140d58 |
with "Unable to connect to the graphic server %s".
|
|
|
140d58 |
|
|
|
140d58 |
Related: https://bugzilla.redhat.com/show_bug.cgi?id=1446161
|
|
|
140d58 |
|
|
|
140d58 |
Signed-off-by: Victor Toso <victortoso@redhat.com>
|
|
|
140d58 |
Acked-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
|
|
|
140d58 |
(cherry picked from commit fb14a8b300ed89a40938302a37679f902b3dab40)
|
|
|
140d58 |
---
|
|
|
140d58 |
src/virt-viewer-session-vnc.c | 6 ++++++
|
|
|
140d58 |
1 file changed, 6 insertions(+)
|
|
|
140d58 |
|
|
|
140d58 |
diff --git a/src/virt-viewer-session-vnc.c b/src/virt-viewer-session-vnc.c
|
|
|
140d58 |
index 26fb405..c79b63c 100644
|
|
|
140d58 |
--- a/src/virt-viewer-session-vnc.c
|
|
|
140d58 |
+++ b/src/virt-viewer-session-vnc.c
|
|
|
140d58 |
@@ -40,6 +40,7 @@ struct _VirtViewerSessionVncPrivate {
|
|
|
140d58 |
GtkWindow *main_window;
|
|
|
140d58 |
/* XXX we should really just have a VncConnection */
|
|
|
140d58 |
VncDisplay *vnc;
|
|
|
140d58 |
+ gboolean auth_dialog_cancelled;
|
|
|
140d58 |
};
|
|
|
140d58 |
|
|
|
140d58 |
#define VIRT_VIEWER_SESSION_VNC_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), VIRT_VIEWER_TYPE_SESSION_VNC, VirtViewerSessionVncPrivate))
|
|
|
140d58 |
@@ -104,6 +105,8 @@ virt_viewer_session_vnc_connected(VncDisplay *vnc G_GNUC_UNUSED,
|
|
|
140d58 |
GtkWidget *display = virt_viewer_display_vnc_new(session, session->priv->vnc);
|
|
|
140d58 |
VirtViewerApp *app = virt_viewer_session_get_app(VIRT_VIEWER_SESSION(session));
|
|
|
140d58 |
|
|
|
140d58 |
+ session->priv->auth_dialog_cancelled = FALSE;
|
|
|
140d58 |
+
|
|
|
140d58 |
virt_viewer_window_set_display(virt_viewer_app_get_main_window(app),
|
|
|
140d58 |
VIRT_VIEWER_DISPLAY(display));
|
|
|
140d58 |
|
|
|
140d58 |
@@ -117,6 +120,8 @@ virt_viewer_session_vnc_disconnected(VncDisplay *vnc G_GNUC_UNUSED,
|
|
|
140d58 |
VirtViewerSessionVnc *session)
|
|
|
140d58 |
{
|
|
|
140d58 |
GtkWidget *display;
|
|
|
140d58 |
+ if (session->priv->auth_dialog_cancelled)
|
|
|
140d58 |
+ return;
|
|
|
140d58 |
|
|
|
140d58 |
virt_viewer_session_clear_displays(VIRT_VIEWER_SESSION(session));
|
|
|
140d58 |
display = virt_viewer_display_vnc_new(session, session->priv->vnc);
|
|
|
140d58 |
@@ -314,6 +319,7 @@ virt_viewer_session_vnc_auth_credential(GtkWidget *src G_GNUC_UNUSED,
|
|
|
140d58 |
|
|
|
140d58 |
if (!ret) {
|
|
|
140d58 |
vnc_display_close(self->priv->vnc);
|
|
|
140d58 |
+ self->priv->auth_dialog_cancelled = TRUE;
|
|
|
140d58 |
g_signal_emit_by_name(self, "session-cancelled");
|
|
|
140d58 |
goto cleanup;
|
|
|
140d58 |
}
|
|
|
140d58 |
--
|
|
|
140d58 |
2.13.0
|
|
|
140d58 |
|