CVS: rdesktop ewmhints.c, 1.15, 1.16 orders.c, 1.55, 1.56 proto.h, 1.113, 1.114

Jay Sorg <[email protected]> Thu, 10 Jul 2008 20:55:54 -0700
Newsgroups gmane.network.rdesktop.cvs
Message-ID <[email protected]>
Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11583

Modified Files:
	ewmhints.c orders.c proto.h 
Log Message:
ran indent and removed some spaces at EOL

Index: ewmhints.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/ewmhints.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ewmhints.c	6 Mar 2008 15:39:21 -0000	1.15
--- ewmhints.c	11 Jul 2008 03:55:52 -0000	1.16
***************
*** 7,21 ****
     Copyright 2005 Peter Astrand <[email protected]> for Cendio AB
     Copyright 2007 Pierre Ossman <[email protected]> for Cendio AB
!    
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
!    
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
!    
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
--- 7,21 ----
     Copyright 2005 Peter Astrand <[email protected]> for Cendio AB
     Copyright 2007 Pierre Ossman <[email protected]> for Cendio AB
! 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
! 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
! 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software

Index: orders.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/orders.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** orders.c	11 Jul 2008 03:51:23 -0000	1.55
--- orders.c	11 Jul 2008 03:55:52 -0000	1.56
***************
*** 152,156 ****
  setup_brush(BRUSH * out_brush, BRUSH * in_brush)
  {
! 	BRUSHDATA * brush_data;
  	uint16 cache_idx;
  	uint8 brush_bpp;
--- 152,156 ----
  setup_brush(BRUSH * out_brush, BRUSH * in_brush)
  {
! 	BRUSHDATA *brush_data;
  	uint16 cache_idx;
  	uint8 brush_bpp;
***************
*** 160,164 ****
  	{
  		brush_bpp = out_brush->style & 0x0f;
! 		if (brush_bpp == 1) /* 1 bpp */
  		{
  			cache_idx = out_brush->pattern[0];
--- 160,164 ----
  	{
  		brush_bpp = out_brush->style & 0x0f;
! 		if (brush_bpp == 1)	/* 1 bpp */
  		{
  			cache_idx = out_brush->pattern[0];
***************
*** 1166,1174 ****
  	in_uint8(s, width);
  	in_uint8(s, height);
! 	in_uint8s(s, 1); /* type, 0x80 = cached */
  	in_uint8(s, size);
  
  	DEBUG(("BRUSHCACHE(idx=%d,dp=%d,wd=%d,ht=%d,sz=%d)\n", cache_idx, depth,
! 		width, height, size));
  
  	if ((depth == 1) && (width == 8) && (height == 8) && (size == 8))
--- 1166,1174 ----
  	in_uint8(s, width);
  	in_uint8(s, height);
! 	in_uint8s(s, 1);	/* type, 0x80 = cached */
  	in_uint8(s, size);
  
  	DEBUG(("BRUSHCACHE(idx=%d,dp=%d,wd=%d,ht=%d,sz=%d)\n", cache_idx, depth,
! 	       width, height, size));
  
  	if ((depth == 1) && (width == 8) && (height == 8) && (size == 8))

Index: proto.h
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/proto.h,v
retrieving revision 1.113
retrieving revision 1.114
diff -C2 -d -r1.113 -r1.114
*** proto.h	11 Jul 2008 03:51:23 -0000	1.113
--- proto.h	11 Jul 2008 03:55:52 -0000	1.114
***************
*** 45,49 ****
  RD_HCURSOR cache_get_cursor(uint16 cache_idx);
  void cache_put_cursor(uint16 cache_idx, RD_HCURSOR cursor);
! BRUSHDATA * cache_get_brush_data(uint16 cache_idx);
  void cache_put_brush_data(uint16 cache_idx, BRUSHDATA * brush_data);
  /* channels.c */
--- 45,49 ----
  RD_HCURSOR cache_get_cursor(uint16 cache_idx);
  void cache_put_cursor(uint16 cache_idx, RD_HCURSOR cursor);
! BRUSHDATA *cache_get_brush_data(uint16 cache_idx);
  void cache_put_brush_data(uint16 cache_idx, BRUSHDATA * brush_data);
  /* channels.c */


-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08