navit-cvs-commit

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv3875

Modified Files:
	graphics.c 
Log Message:
Fixed a bug reported by Helge Halfting (Thanks!) regarding xpm loading

Index: graphics.c
===================================================================
RCS file: /cvsroot/navit/navit/src/graphics.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** graphics.c	6 Dec 2007 21:41:21 -0000	1.21
--- graphics.c	9 Dec 2007 10:53:25 -0000	1.22
***************
*** 1,4 ****
--- 1,5 ----
  #include <glib.h>
  #include <stdio.h>
+ #include <stdlib.h>
  #include <math.h>
  #include "debug.h"
***************
*** 378,382 ****
  				case element_icon:
  					if (!img) {
! 						char *icon=g_strdup_printf("xpm/%s", e->u.icon.src);
  						img=graphics_image_new(gra, icon);
  						g_free(icon);
--- 379,383 ----
  				case element_icon:
  					if (!img) {
! 						char *icon=g_strjoin(NULL,getenv("NAVIT_SHAREDIR"), "/xpm/", e->u.icon.src, NULL);
  						img=graphics_image_new(gra, icon);
  						g_free(icon);