CVS: rdesktop cliprdr.c,1.24,1.25 xclip.c,1.22,1.23

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

Modified Files:
	cliprdr.c xclip.c 
Log Message:
Indent fixes

Index: cliprdr.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/cliprdr.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** cliprdr.c	7 Nov 2005 13:15:19 -0000	1.24
--- cliprdr.c	14 Nov 2005 14:46:16 -0000	1.25
***************
*** 73,77 ****
  cliprdr_send_native_format_announce(uint8 * formats_data, uint32 formats_data_length)
  {
! 	cliprdr_send_packet(CLIPRDR_FORMAT_ANNOUNCE, CLIPRDR_REQUEST, formats_data, formats_data_length);
  }
  
--- 73,78 ----
  cliprdr_send_native_format_announce(uint8 * formats_data, uint32 formats_data_length)
  {
! 	cliprdr_send_packet(CLIPRDR_FORMAT_ANNOUNCE, CLIPRDR_REQUEST, formats_data,
! 			    formats_data_length);
  }
  

Index: xclip.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xclip.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** xclip.c	14 Nov 2005 14:11:42 -0000	1.22
--- xclip.c	14 Nov 2005 14:46:16 -0000	1.23
***************
*** 202,209 ****
  		g_waiting_for_INCR = 1;
  		return;
! 	} 
! 	
  	XDeleteProperty(g_display, g_wnd, rdesktop_clipboard_target_atom);
! 		
  	/* Negotiate target format */
  	if (event->target == targets_atom)
--- 202,209 ----
  		g_waiting_for_INCR = 1;
  		return;
! 	}
! 
  	XDeleteProperty(g_display, g_wnd, rdesktop_clipboard_target_atom);
! 
  	/* Negotiate target format */
  	if (event->target == targets_atom)
***************
*** 256,260 ****
  	return;
  
!  fail:
  	XDeleteProperty(g_display, g_wnd, rdesktop_clipboard_target_atom);
  	XFree(data);
--- 256,260 ----
  	return;
  
!       fail:
  	XDeleteProperty(g_display, g_wnd, rdesktop_clipboard_target_atom);
  	XFree(data);
***************
*** 327,331 ****
  xclip_handle_PropertyNotify(XPropertyEvent * event)
  {
! 	unsigned long nitems; 
  	unsigned long offset = 0;
  	unsigned long bytes_left = 1;
--- 327,331 ----
  xclip_handle_PropertyNotify(XPropertyEvent * event)
  {
! 	unsigned long nitems;
  	unsigned long offset = 0;
  	unsigned long bytes_left = 1;
***************
*** 339,346 ****
  		DEBUG_CLIPBOARD(("x_clip_handle_PropertyNotify: g_waiting_for_INCR != 0\n"));
  
! 		while (bytes_left > 0) {
! 			if ((XGetWindowProperty(g_display, g_wnd, rdesktop_clipboard_target_atom, offset,
! 						4096L, False, AnyPropertyType,
! 						&type, &format, &nitems, &bytes_left, &data) != Success))
  			{
  				XFree(data);
--- 339,348 ----
  		DEBUG_CLIPBOARD(("x_clip_handle_PropertyNotify: g_waiting_for_INCR != 0\n"));
  
! 		while (bytes_left > 0)
! 		{
! 			if ((XGetWindowProperty
! 			     (g_display, g_wnd, rdesktop_clipboard_target_atom, offset, 4096L,
! 			      False, AnyPropertyType, &type, &format, &nitems, &bytes_left,
! 			      &data) != Success))
  			{
  				XFree(data);
***************
*** 351,355 ****
  			{
  				XGetWindowAttributes(g_display, g_wnd, &wa);
! 				XSelectInput(g_display, g_wnd, (wa.your_event_mask ^ PropertyChangeMask));
  				XFree(data);
  				g_waiting_for_INCR = 0;
--- 353,358 ----
  			{
  				XGetWindowAttributes(g_display, g_wnd, &wa);
! 				XSelectInput(g_display, g_wnd,
! 					     (wa.your_event_mask ^ PropertyChangeMask));
  				XFree(data);
  				g_waiting_for_INCR = 0;
***************
*** 373,377 ****
  				uint8 *tmp;
  
! 				offset += (length/4);
  				DEBUG_CLIPBOARD(("Translating linebreaks before sending data\n"));
  				translated_data = lf2crlf(data, &length);
--- 376,380 ----
  				uint8 *tmp;
  
! 				offset += (length / 4);
  				DEBUG_CLIPBOARD(("Translating linebreaks before sending data\n"));
  				translated_data = lf2crlf(data, &length);
***************
*** 381,385 ****
  				xfree(g_clip_buffer);
  
! 				strncpy((char *) (tmp + g_clip_buflen), (char *) translated_data, length);
  				xfree(translated_data);
  
--- 384,389 ----
  				xfree(g_clip_buffer);
  
! 				strncpy((char *) (tmp + g_clip_buflen), (char *) translated_data,
! 					length);
  				xfree(translated_data);
  



-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP.  Click here to play: http://sourceforge.net/geronimo.php