Remove deprecated rdp2vnc

Fixes issue #95

Makefile.in

@@ -20,39 +20,20 @@ CFLAGS      = @CFLAGS@ @X_CFLAGS@ @DEFS@ -DKEYMAP_PATH=\"$(KEYMAP_PATH)\"
 LDFLAGS     = @LDFLAGS@ @LIBS@ @X_LIBS@ @X_EXTRA_LIBS@
 STRIP       = @STRIP@
 
-TARGETS     = rdesktop @RDP2VNCTARGET@
-VNCINC      = @VNCINC@
-LDVNC       = @LDVNC@
-VNCLINK     = @VNCLINK@
+TARGETS     = rdesktop
 SOUNDOBJ    = @SOUNDOBJ@
 SCARDOBJ    = @SCARDOBJ@
 CREDSSPOBJ  = @CREDSSPOBJ@
 
 RDPOBJ   = tcp.o asn.o iso.o mcs.o secure.o licence.o rdp.o orders.o bitmap.o cache.o rdp5.o channels.o rdpdr.o serial.o printer.o disk.o parallel.o printercache.o mppc.o pstcache.o lspci.o seamless.o ssl.o utils.o
 X11OBJ   = rdesktop.o xwin.o xkeymap.o ewmhints.o xclip.o cliprdr.o ctrl.o
-VNCOBJ   = vnc/rdp2vnc.o vnc/vnc.o vnc/xkeymap.o vnc/x11stubs.o
 
 .PHONY: all
 all: $(TARGETS)
 
 rdesktop: $(X11OBJ) $(SOUNDOBJ) $(RDPOBJ) $(SCARDOBJ) $(CREDSSPOBJ)
 	$(CC) $(CFLAGS) -o rdesktop $(X11OBJ) $(SOUNDOBJ) $(RDPOBJ) $(SCARDOBJ) $(CREDSSPOBJ) $(LDFLAGS) -lX11
 
-rdp2vnc: $(VNCOBJ) $(SOUNDOBJ) $(RDPOBJ) $(SCARDOBJ) $(CREDSSPOBJ)
-	$(VNCLINK) $(CFLAGS) -o rdp2vnc $(VNCOBJ) $(SOUNDOBJ) $(RDPOBJ) $(SCARDOBJ) $(CREDSSPOBJ) $(LDFLAGS) $(LDVNC)
-
-vnc/rdp2vnc.o: rdesktop.c
-	$(CC) $(CFLAGS) $(VNCINC) -DRDP2VNC -o vnc/rdp2vnc.o -c rdesktop.c
-
-vnc/vnc.o: vnc/vnc.c
-	$(CC) $(CFLAGS) $(VNCINC) -DRDP2VNC -o vnc/vnc.o -c vnc/vnc.c
-
-vnc/xkeymap.o: xkeymap.c
-	$(CC) $(CFLAGS) $(VNCINC) -DRDP2VNC -o vnc/xkeymap.o -c xkeymap.c
-
-vnc/x11stubs.o: vnc/x11stubs.c
-	$(CC) $(CFLAGS) $(VNCINC) -o vnc/x11stubs.o -c vnc/x11stubs.c
-
 .PHONY: install
 install: installbin installkeymaps installman
 
@@ -91,7 +72,7 @@ proto:
 
 .PHONY: clean
 clean:
-	rm -f *.o *~ vnc/*.o vnc/*~ rdesktop rdp2vnc
+	rm -f *.o *~ rdesktop
 
 .PHONY: distclean
 distclean: clean

configure.ac

@@ -234,28 +234,6 @@ AC_ARG_WITH(egd-socket,
 AC_DEFINE_UNQUOTED(EGD_SOCKET, "$EGD_SOCKET")
 
 
-#
-# rdp2vnc
-#
-vncserverconfig=libvncserver-config
-AC_ARG_WITH(libvncserver-config,
-    [  --with-libvncserver-config=CMD  use CMD as libvncserver-config],
-    [vncserverconfig="$withval"]
-)
-AC_ARG_WITH(libvncserver,
-    [  --with-libvncserver     make rdp2vnc],
-    [ 
-    VNCINC=`$vncserverconfig --cflags`
-    AC_SUBST(VNCINC)
-    LDVNC=`$vncserverconfig --libs`
-    AC_SUBST(LDVNC)
-    VNCLINK=`$vncserverconfig --link`
-    AC_SUBST(VNCLINK)
-    RDP2VNCTARGET="rdp2vnc"
-    AC_SUBST(RDP2VNCTARGET)
-    ]
-)
-
 #
 # sound
 #

indent-all.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-indent -bli0 -i8 -cli8 -npcs -l100 *.h *.c vnc/*.h vnc/*.c
+indent -bli0 -i8 -cli8 -npcs -l100 *.h *.c
 # Tweak in order to support both indent 2.2.10 and 2.2.11
 perl -pi -e 's|!!|! !|g' *.c
 

rdesktop.c

@@ -152,13 +152,6 @@ extern RDPDR_DEVICE g_rdpdr_device[];
 extern uint32 g_num_devices;
 extern char *g_rdpdr_clientname;
 
-#ifdef RDP2VNC
-extern int rfb_port;
-extern int defer_time;
-void
-rdp2vnc_connect(char *server, uint32 flags, char *domain, char *password,
-		char *shell, char *directory);
-#endif
 /* Display usage information */
 static void
 usage(char *program)
@@ -169,10 +162,6 @@ usage(char *program)
 	fprintf(stderr, "See http://www.rdesktop.org/ for more information.\n\n");
 
 	fprintf(stderr, "Usage: %s [options] server[:port]\n", program);
-#ifdef RDP2VNC
-	fprintf(stderr, "   -V: vnc port\n");
-	fprintf(stderr, "   -Q: defer time (ms)\n");
-#endif
 	fprintf(stderr, "   -u: user name\n");
 	fprintf(stderr, "   -d: domain\n");
 	fprintf(stderr, "   -s: shell / seamless application to start remotely\n");
@@ -565,30 +554,11 @@ main(int argc, char *argv[])
 
 	g_num_devices = 0;
 
-#ifdef RDP2VNC
-#define VNCOPT "V:Q:"
-#else
-#define VNCOPT
-#endif
 	while ((c = getopt(argc, argv,
-			   VNCOPT "A:u:L:d:s:c:p:n:k:g:o:fbBeEitmzCDKS:T:NX:a:x:Pr:045vh?")) != -1)
+			   "A:u:L:d:s:c:p:n:k:g:o:fbBeEitmzCDKS:T:NX:a:x:Pr:045vh?")) != -1)
 	{
 		switch (c)
 		{
-#ifdef RDP2VNC
-			case 'V':
-				rfb_port = strtol(optarg, NULL, 10);
-				if (rfb_port < 100)
-					rfb_port += 5900;
-				break;
-
-			case 'Q':
-				defer_time = strtol(optarg, NULL, 10);
-				if (defer_time < 0)
-					defer_time = 0;
-				break;
-#endif
-
 			case 'A':
 				g_seamless_rdp = True;
 				STRNCPY(g_seamless_shell, optarg, sizeof(g_seamless_shell));
@@ -1096,11 +1066,6 @@ main(int argc, char *argv[])
 		strncat(g_title, server, sizeof(g_title) - sizeof("rdesktop - "));
 	}
 
-#ifdef RDP2VNC
-	rdp2vnc_connect(server, flags, domain, g_password, shell, directory);
-	return EX_OK;
-#else
-
 	/* Only startup ctrl functionality is seamless are used for now. */
 	if (g_use_ctrl && g_seamless_rdp)
 	{
@@ -1241,7 +1206,6 @@ main(int argc, char *argv[])
 
 	return handle_disconnect_reason(deactivated, ext_disc_reason);
 
-#endif
 	if (g_redirect_username)
 		xfree(g_redirect_username);