From 6437a68ae0a92bcee64d6fc4586f345128fcb7c3 Mon Sep 17 00:00:00 2001
From: Benjamin Franzke <benjaminfranzke@googlemail.com>
Date: Thu, 22 Sep 2011 22:16:38 +0200
Subject: Fixup async read by using GPollableInputStream instead of GSocket

With the GSource created from GSocket hacks were needed
to get all events.
GPollableInputStream is the interface implemented directly
by GTlsInputStream.
---
 src/cmumble.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/cmumble.h')

diff --git a/src/cmumble.h b/src/cmumble.h
index a6cc7f2..af8396a 100644
--- a/src/cmumble.h
+++ b/src/cmumble.h
@@ -25,7 +25,9 @@ struct context {
 	GSocketClient *sock_client;
 	GSocketConnection *conn;
 	GSocket *sock;
-	GIOStream *iostream;
+
+	GPollableInputStream *input;
+	GOutputStream *output;
 
 	uint8_t celt_header_packet[sizeof(CELTHeader)];
 	CELTHeader celt_header;
@@ -72,7 +74,7 @@ typedef void (*callback_t)(ProtobufCMessage *msg, struct context *);
 void
 send_msg(struct context *ctx, ProtobufCMessage *msg);
 
-void
+int
 recv_msg(struct context *ctx, const struct mumble_callbacks *callbacks);
 
 #endif
-- 
cgit