--- sourceforge.net/trunk/rdesktop/channels.c	2004/06/15 22:45:12	711
+++ sourceforge.net/trunk/rdesktop/channels.c	2006/03/27 08:17:34	1199
@@ -2,7 +2,7 @@
    rdesktop: A Remote Desktop Protocol client.
    Protocol services - Virtual channels
    Copyright (C) Erik Forsberg <forsberg@cendio.se> 2003
-   Copyright (C) Matthew Chapman 2003
+   Copyright (C) Matthew Chapman 2003-2005
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
 
 #include "rdesktop.h"
 
-#define MAX_CHANNELS			4
+#define MAX_CHANNELS			6
 #define CHANNEL_CHUNK_LENGTH		1600
 #define CHANNEL_FLAG_FIRST		0x01
 #define CHANNEL_FLAG_LAST		0x02
@@ -87,7 +87,7 @@
 	s_pop_layer(s, channel_hdr);
 	length = s->end - s->p - 8;
 
-	DEBUG_CLIPBOARD(("channel_send, length = %d\n", length));
+	DEBUG_CHANNEL(("channel_send, length = %d\n", length));
 
 	thislength = MIN(length, CHANNEL_CHUNK_LENGTH);
 /* Note: In the original clipboard implementation, this number was
@@ -102,7 +102,7 @@
 	out_uint32_le(s, length);
 	out_uint32_le(s, flags);
 	data = s->end = s->p + thislength;
-	DEBUG_CLIPBOARD(("Sending %d bytes with FLAG_FIRST\n", thislength));
+	DEBUG_CHANNEL(("Sending %d bytes with FLAG_FIRST\n", thislength));
 	sec_send_to_channel(s, g_encryption ? SEC_ENCRYPT : 0, channel->mcs_id);
 
 	/* subsequent segments copied (otherwise would have to generate headers backwards) */
@@ -114,7 +114,7 @@
 		if (channel->flags & CHANNEL_OPTION_SHOW_PROTOCOL)
 			flags |= CHANNEL_FLAG_SHOW_PROTOCOL;
 
-		DEBUG_CLIPBOARD(("Sending %d bytes with flags %d\n", thislength, flags));
+		DEBUG_CHANNEL(("Sending %d bytes with flags %d\n", thislength, flags));
 
 		s = sec_init(g_encryption ? SEC_ENCRYPT : 0, thislength + 8);
 		out_uint32_le(s, length);
@@ -161,7 +161,7 @@
 		{
 			if (length > in->size)
 			{
-				in->data = (uint8*)xrealloc(in->data, length);
+				in->data = (uint8 *) xrealloc(in->data, length);
 				in->size = length;
 			}
 			in->p = in->data;