CVS: rdesktop rdesktop.c,1.146,1.147 xclip.c,1.38,1.39

Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5930

Modified Files:
	rdesktop.c xclip.c 
Log Message:
Cut down own the redundant clipboard mode arguments.


Index: rdesktop.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdesktop.c,v
retrieving revision 1.146
retrieving revision 1.147
diff -C2 -d -r1.146 -r1.147
*** rdesktop.c	27 Mar 2006 09:20:24 -0000	1.146
--- rdesktop.c	28 Mar 2006 14:46:47 -0000	1.147
***************
*** 183,191 ****
  	fprintf(stderr, "                     remote would leave sound on server\n");
  	fprintf(stderr,
! 		"         '-r clipboard:[on|off|auto|PRIMARYCLIPBOARD|CLIPBOARD]': enable clip-\n");
! 	fprintf(stderr, "                      board redirection.\n");
  	fprintf(stderr,
! 		"                      'on|auto|PRIMARYCLIPBOARD' looks at both PRIMARY and\n");
! 	fprintf(stderr, "                      CLIPBOARD when sending data to server.\n");
  	fprintf(stderr, "                      'CLIPBOARD' looks at only CLIPBOARD.\n");
  	fprintf(stderr, "   -0: attach to console\n");
--- 183,191 ----
  	fprintf(stderr, "                     remote would leave sound on server\n");
  	fprintf(stderr,
! 		"         '-r clipboard:[off|PRIMARYCLIPBOARD|CLIPBOARD]': enable clipboard\n");
! 	fprintf(stderr, "                      redirection.\n");
  	fprintf(stderr,
! 		"                      'PRIMARYCLIPBOARD' looks at both PRIMARY and CLIPBOARD\n");
! 	fprintf(stderr, "                      when sending data to server.\n");
  	fprintf(stderr, "                      'CLIPBOARD' looks at only CLIPBOARD.\n");
  	fprintf(stderr, "   -0: attach to console\n");

Index: xclip.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xclip.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** xclip.c	28 Mar 2006 13:56:08 -0000	1.38
--- xclip.c	28 Mar 2006 14:46:47 -0000	1.39
***************
*** 1113,1118 ****
  	g_rdpclip = True;
  
! 	if (str_startswith(optarg, "auto") || str_startswith(optarg, "on")
! 	    || str_startswith(optarg, "PRIMARYCLIPBOARD"))
  		auto_mode = True;
  	else if (str_startswith(optarg, "CLIPBOARD"))
--- 1113,1117 ----
  	g_rdpclip = True;
  
! 	if (str_startswith(optarg, "PRIMARYCLIPBOARD"))
  		auto_mode = True;
  	else if (str_startswith(optarg, "CLIPBOARD"))



-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642