--- sourceforge.net/trunk/rdesktop/rdesktop.c	2003/05/19 21:36:33	376
+++ sourceforge.net/trunk/rdesktop/rdesktop.c	2003/06/06 11:11:20	416
@@ -371,6 +371,11 @@
 	if (!ui_init())
 		return 1;
 
+	ipc_init();		// Must be run after ui_init, we need X to be setup.
+
+	if (use_rdp5)
+		cliprdr_init();	// FIXME: Should perhaps be integrated into the channel management code?
+
 	if (!rdp_connect(server, flags, domain, password, shell, directory))
 		return 1;
 
@@ -588,7 +593,7 @@
 	if (home == NULL)
 		return -1;
 
-	path = (char*)xmalloc(strlen(home) + strlen(hostname) + sizeof("/.rdesktop/licence."));
+	path = (char *) xmalloc(strlen(home) + strlen(hostname) + sizeof("/.rdesktop/licence."));
 	sprintf(path, "%s/.rdesktop/licence.%s", home, hostname);
 
 	fd = open(path, O_RDONLY);
@@ -598,7 +603,7 @@
 	if (fstat(fd, &st))
 		return -1;
 
-	*data = (uint8*)xmalloc(st.st_size);
+	*data = (uint8 *) xmalloc(st.st_size);
 	length = read(fd, *data, st.st_size);
 	close(fd);
 	xfree(path);
@@ -615,7 +620,7 @@
 	if (home == NULL)
 		return;
 
-	path = (char*)xmalloc(strlen(home) + strlen(hostname) + sizeof("/.rdesktop/licence."));
+	path = (char *) xmalloc(strlen(home) + strlen(hostname) + sizeof("/.rdesktop/licence."));
 
 	sprintf(path, "%s/.rdesktop", home);
 	if ((mkdir(path, 0700) == -1) && errno != EEXIST)
@@ -627,11 +632,11 @@
 	/* write licence to licence.hostname.new, then atomically rename to licence.hostname */
 
 	sprintf(path, "%s/.rdesktop/licence.%s", home, hostname);
-	tmppath = (char*)xmalloc(strlen(path) + sizeof(".new"));
+	tmppath = (char *) xmalloc(strlen(path) + sizeof(".new"));
 	strcpy(tmppath, path);
 	strcat(tmppath, ".new");
 
-	fd = open(tmppath, O_WRONLY|O_CREAT|O_TRUNC, 0600);
+	fd = open(tmppath, O_WRONLY | O_CREAT | O_TRUNC, 0600);
 	if (fd == -1)
 	{
 		perror(tmppath);