CVS: rdesktop xkeymap.c,1.76,1.77

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

Modified Files:
	xkeymap.c 
Log Message:
~/.rdesktop/keymaps is now tried before KEYMAP_PATH

Index: xkeymap.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xkeymap.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** xkeymap.c	3 Aug 2005 08:25:32 -0000	1.76
--- xkeymap.c	3 Aug 2005 08:41:00 -0000	1.77
***************
*** 185,195 ****
  	FILE *fp;
  
- 	/* Try KEYMAP_PATH */
- 	path1 = pathjoin(KEYMAP_PATH, filename);
- 	fp = fopen(path1, "r");
- 	xfree(path1);
- 	if (fp)
- 		return fp;
- 
  	/* Try ~/.rdesktop/keymaps */
  	home = getenv("HOME");
--- 185,188 ----
***************
*** 205,208 ****
--- 198,208 ----
  	}
  
+ 	/* Try KEYMAP_PATH */
+ 	path1 = pathjoin(KEYMAP_PATH, filename);
+ 	fp = fopen(path1, "r");
+ 	xfree(path1);
+ 	if (fp)
+ 		return fp;
+ 
  	/* Try current directory, in case we are running from the source
  	   tree */



-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click