CVS: rdesktop xclip.c,1.40,1.41

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

Modified Files:
	xclip.c 
Log Message:
QT sets incorrect types on clipboard properties so we have to accept
everything and hope for the best.


Index: xclip.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xclip.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** xclip.c	9 Apr 2006 20:11:42 -0000	1.40
--- xclip.c	15 May 2006 11:38:49 -0000	1.41
***************
*** 519,523 ****
  			res = XGetWindowProperty(g_display, g_wnd,
  						 rdesktop_primary_timestamp_target_atom, 0,
! 						 XMaxRequestSize(g_display), False, XA_INTEGER,
  						 &type, &format, &nitems, &bytes_left, &data);
  		}
--- 519,523 ----
  			res = XGetWindowProperty(g_display, g_wnd,
  						 rdesktop_primary_timestamp_target_atom, 0,
! 						 XMaxRequestSize(g_display), False, AnyPropertyType,
  						 &type, &format, &nitems, &bytes_left, &data);
  		}
***************
*** 526,535 ****
  			res = XGetWindowProperty(g_display, g_wnd,
  						 rdesktop_clipboard_timestamp_target_atom, 0,
! 						 XMaxRequestSize(g_display), False, XA_INTEGER,
  						 &type, &format, &nitems, &bytes_left, &data);
  		}
  
  
! 		if ((res != Success) || (nitems != 1))
  		{
  			DEBUG_CLIPBOARD(("XGetWindowProperty failed!\n"));
--- 526,535 ----
  			res = XGetWindowProperty(g_display, g_wnd,
  						 rdesktop_clipboard_timestamp_target_atom, 0,
! 						 XMaxRequestSize(g_display), False, AnyPropertyType,
  						 &type, &format, &nitems, &bytes_left, &data);
  		}
  
  
! 		if ((res != Success) || (nitems != 1) || (format != 32))
  		{
  			DEBUG_CLIPBOARD(("XGetWindowProperty failed!\n"));



-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642