|
 |
eec4b3 |
From 3895d4e7532bb853fb62ff1991449398dee899b1 Mon Sep 17 00:00:00 2001
|
|
|
eec4b3 |
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
|
|
|
eec4b3 |
Date: Thu, 9 Apr 2015 13:25:36 +0200
|
|
|
eec4b3 |
Subject: [PATCH] session-spice: Destroy the channel instead of emit a
|
|
|
eec4b3 |
"session-disconnect" signal
|
|
|
eec4b3 |
|
|
|
eec4b3 |
Whenever we reach these branches, we will abort or have to create a new
|
|
|
eec4b3 |
spice session (from the dialog showed to the user). So, destroying the
|
|
|
eec4b3 |
channel on these situations seems sane enough.
|
|
|
eec4b3 |
It also avoids an error dialog to be popped out twice with (basically)
|
|
|
eec4b3 |
the same information.
|
|
|
eec4b3 |
|
|
|
eec4b3 |
(cherry picked from commit f3fe9ffe7bd56a62e3a78f5974620fb54151918a)
|
|
|
eec4b3 |
---
|
|
|
eec4b3 |
src/virt-viewer-session-spice.c | 4 ++--
|
|
|
eec4b3 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
eec4b3 |
|
|
|
eec4b3 |
diff --git a/src/virt-viewer-session-spice.c b/src/virt-viewer-session-spice.c
|
|
|
eec4b3 |
index d3d7edc..f7a8dc7 100644
|
|
|
eec4b3 |
--- a/src/virt-viewer-session-spice.c
|
|
|
eec4b3 |
+++ b/src/virt-viewer-session-spice.c
|
|
|
eec4b3 |
@@ -591,7 +591,7 @@ virt_viewer_session_spice_main_channel_event(SpiceChannel *channel G_GNUC_UNUSED
|
|
|
eec4b3 |
spice_session_connect(self->priv->session);
|
|
|
eec4b3 |
}
|
|
|
eec4b3 |
} else {
|
|
|
eec4b3 |
- g_signal_emit_by_name(session, "session-disconnected", error ? error->message : NULL);
|
|
|
eec4b3 |
+ virt_viewer_session_spice_channel_destroy(NULL, channel, session);
|
|
|
eec4b3 |
}
|
|
|
eec4b3 |
}
|
|
|
eec4b3 |
#else
|
|
|
eec4b3 |
@@ -602,7 +602,7 @@ virt_viewer_session_spice_main_channel_event(SpiceChannel *channel G_GNUC_UNUSED
|
|
|
eec4b3 |
case SPICE_CHANNEL_ERROR_IO:
|
|
|
eec4b3 |
case SPICE_CHANNEL_ERROR_LINK:
|
|
|
eec4b3 |
case SPICE_CHANNEL_ERROR_TLS:
|
|
|
eec4b3 |
- g_signal_emit_by_name(session, "session-disconnected", NULL);
|
|
|
eec4b3 |
+ virt_viewer_session_spice_channel_destroy(NULL, channel, session);
|
|
|
eec4b3 |
break;
|
|
|
eec4b3 |
default:
|
|
|
eec4b3 |
g_warning("unhandled spice main channel event: %d", event);
|