CVS: rdesktop xclip.c,1.44,1.45

Michael Gernoth <[email protected]> Wed, 07 Mar 2007 07:48:11 -0800
Newsgroups gmane.network.rdesktop.cvs
Message-ID <[email protected]>
Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21129

Modified Files:
	xclip.c 
Log Message:
check if there is any data returned from XGetWindowProperty before
calling xclip_send_data_with_convert.


Index: xclip.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xclip.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** xclip.c	4 Mar 2007 11:32:09 -0000	1.44
--- xclip.c	7 Mar 2007 15:48:08 -0000	1.45
***************
*** 290,296 ****
  			 XGetAtomName(g_display, target), (unsigned) source_size));
  
- 	if ((!source) || source_size == 0)
- 		return False;
- 
  #ifdef USE_UNICODE_CLIPBOARD
  	if (target == format_string_atom ||
--- 290,293 ----
***************
*** 717,721 ****
  			cliprdr_send_native_format_announce(data, nitems);
  		}
! 		else if (!xclip_send_data_with_convert(data, nitems, event->target))
  		{
  			goto fail;
--- 714,718 ----
  			cliprdr_send_native_format_announce(data, nitems);
  		}
! 		else if ((!nitems) || (!xclip_send_data_with_convert(data, nitems, event->target)))
  		{
  			goto fail;


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV