[gtk-vnc] Fix emitting of unsupported auth signal
- From: Daniel P. Berrange <dberrange src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-vnc] Fix emitting of unsupported auth signal
- Date: Tue, 6 Jul 2010 13:36:52 +0000 (UTC)
commit 2654b59100b2d6a75e365e9e9d83f9282ca4e0ec
Author: Daniel P. Berrange <dan berrange com>
Date: Mon Jul 5 21:43:41 2010 +0100
Fix emitting of unsupported auth signal
The vnc_connection_set_auth_type method is invoked from the system
coroutine, so it must directly emit the signal, not use the delayed
signal emitter
src/vncconnection.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/vncconnection.c b/src/vncconnection.c
index a64cab4..cc30db8 100644
--- a/src/vncconnection.c
+++ b/src/vncconnection.c
@@ -869,7 +869,7 @@ static void vnc_connection_flush(VncConnection *conn)
{
VncConnectionPrivate *priv = conn->priv;
- //VNC_DEBUG("STart write %d", priv->has_error);
+ //VNC_DEBUG("Start flush write %d", priv->has_error);
#if HAVE_SASL
if (priv->saslconn)
vnc_connection_flush_sasl(conn);
@@ -1473,6 +1473,8 @@ gboolean vnc_connection_framebuffer_update_request(VncConnection *conn,
guint16 x, guint16 y,
guint16 width, guint16 height)
{
+ VNC_DEBUG("Requesting framebuffer update at %d,%d size %dx%d, incremental %d",
+ x, y, width, height, incremental);
vnc_connection_buffered_write_u8(conn, 3);
vnc_connection_buffered_write_u8(conn, incremental);
vnc_connection_buffered_write_u16(conn, x);
@@ -4555,10 +4557,8 @@ gboolean vnc_connection_set_auth_type(VncConnection *conn, unsigned int type)
type != VNC_CONNECTION_AUTH_TLS &&
type != VNC_CONNECTION_AUTH_VENCRYPT &&
type != VNC_CONNECTION_AUTH_SASL) {
- struct signal_data sigdata;
VNC_DEBUG("Unsupported auth type %u", type);
- sigdata.params.authUnsupported = type;
- vnc_connection_emit_main_context(conn, VNC_AUTH_UNSUPPORTED, &sigdata);
+ g_signal_emit(conn, VNC_AUTH_UNSUPPORTED, 0, type);
priv->has_error = TRUE;
return !vnc_connection_has_error(conn);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]